From 951cb273acfa9963450b2790b4ac369d54c9feff Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com> Date: Sat, 2 Dec 2023 16:33:54 +0000 Subject: [PATCH 1/3] Revert "raise lower bound on mtl to a real version (#3499)" This reverts commit f94c0311c115ec2127acc3f22ef928cb9ee0ad2f. --- cabal.project | 2 +- package.yaml | 2 +- scripts/nix/sha256map.nix | 2 +- simplex-chat.cabal | 16 ++++++++-------- stack.yaml | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cabal.project b/cabal.project index a8bb4c2f85..026f963f7a 100644 --- a/cabal.project +++ b/cabal.project @@ -9,7 +9,7 @@ constraints: zip +disable-bzip2 +disable-zstd source-repository-package type: git location: https://github.com/simplex-chat/simplexmq.git - tag: 117168ccce93ef5ac478c02e3f02a018fa8a2200 + tag: 90a8fc91d35c578c3b52ad296a6f1df715da2278 source-repository-package type: git diff --git a/package.yaml b/package.yaml index e77d43546f..7c828ed7d5 100644 --- a/package.yaml +++ b/package.yaml @@ -33,7 +33,7 @@ dependencies: - http-types == 0.12.* - http2 >= 4.2.2 && < 4.3 - memory >= 0.15 && < 0.19 - - mtl >= 2.3.1 && < 3 + - mtl >= 2.2 && < 3 - network >= 3.1.2.7 && < 3.2 - network-transport >= 0.5.6 && < 0.6 - optparse-applicative >= 0.15 && < 0.17 diff --git a/scripts/nix/sha256map.nix b/scripts/nix/sha256map.nix index 7e39845fea..15a4b04ec1 100644 --- a/scripts/nix/sha256map.nix +++ b/scripts/nix/sha256map.nix @@ -1,5 +1,5 @@ { - "https://github.com/simplex-chat/simplexmq.git"."117168ccce93ef5ac478c02e3f02a018fa8a2200" = "1091c4b8qjp9v29z862b7clda90w3kb4v2aqp5b2jh6yprlga98w"; + "https://github.com/simplex-chat/simplexmq.git"."90a8fc91d35c578c3b52ad296a6f1df715da2278" = "1yjixh6b2s1law3kh885fsbr1inv1r7iy4g9g2bn6j4ygdn8vlzy"; "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38"; "https://github.com/kazu-yamamoto/http2.git"."f5525b755ff2418e6e6ecc69e877363b0d0bcaeb" = "0fyx0047gvhm99ilp212mmz37j84cwrfnpmssib5dw363fyb88b6"; "https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d"; diff --git a/simplex-chat.cabal b/simplex-chat.cabal index 3c080e4b53..6f7e61eda8 100644 --- a/simplex-chat.cabal +++ b/simplex-chat.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.35.5. +-- This file has been generated from package.yaml by hpack version 0.36.0. -- -- see: https://github.com/sol/hpack @@ -185,7 +185,7 @@ library , http-types ==0.12.* , http2 >=4.2.2 && <4.3 , memory >=0.15 && <0.19 - , mtl >=2.3.1 && <3 + , mtl >=2.2 && <3 , network >=3.1.2.7 && <3.2 , network-transport >=0.5.6 && <0.6 , optparse-applicative >=0.15 && <0.17 @@ -237,7 +237,7 @@ executable simplex-bot , http-types ==0.12.* , http2 >=4.2.2 && <4.3 , memory >=0.15 && <0.19 - , mtl >=2.3.1 && <3 + , mtl >=2.2 && <3 , network >=3.1.2.7 && <3.2 , network-transport >=0.5.6 && <0.6 , optparse-applicative >=0.15 && <0.17 @@ -290,7 +290,7 @@ executable simplex-bot-advanced , http-types ==0.12.* , http2 >=4.2.2 && <4.3 , memory >=0.15 && <0.19 - , mtl >=2.3.1 && <3 + , mtl >=2.2 && <3 , network >=3.1.2.7 && <3.2 , network-transport >=0.5.6 && <0.6 , optparse-applicative >=0.15 && <0.17 @@ -345,7 +345,7 @@ executable simplex-broadcast-bot , http-types ==0.12.* , http2 >=4.2.2 && <4.3 , memory >=0.15 && <0.19 - , mtl >=2.3.1 && <3 + , mtl >=2.2 && <3 , network >=3.1.2.7 && <3.2 , network-transport >=0.5.6 && <0.6 , optparse-applicative >=0.15 && <0.17 @@ -399,7 +399,7 @@ executable simplex-chat , http-types ==0.12.* , http2 >=4.2.2 && <4.3 , memory >=0.15 && <0.19 - , mtl >=2.3.1 && <3 + , mtl >=2.2 && <3 , network ==3.1.* , network-transport >=0.5.6 && <0.6 , optparse-applicative >=0.15 && <0.17 @@ -457,7 +457,7 @@ executable simplex-directory-service , http-types ==0.12.* , http2 >=4.2.2 && <4.3 , memory >=0.15 && <0.19 - , mtl >=2.3.1 && <3 + , mtl >=2.2 && <3 , network >=3.1.2.7 && <3.2 , network-transport >=0.5.6 && <0.6 , optparse-applicative >=0.15 && <0.17 @@ -541,7 +541,7 @@ test-suite simplex-chat-test , http-types ==0.12.* , http2 >=4.2.2 && <4.3 , memory >=0.15 && <0.19 - , mtl >=2.3.1 && <3 + , mtl >=2.2 && <3 , network ==3.1.* , network-transport >=0.5.6 && <0.6 , optparse-applicative >=0.15 && <0.17 diff --git a/stack.yaml b/stack.yaml index 69f8e21213..2866c9bfa0 100644 --- a/stack.yaml +++ b/stack.yaml @@ -49,7 +49,7 @@ extra-deps: # - simplexmq-1.0.0@sha256:34b2004728ae396e3ae449cd090ba7410781e2b3cefc59259915f4ca5daa9ea8,8561 # - ../simplexmq - github: simplex-chat/simplexmq - commit: 117168ccce93ef5ac478c02e3f02a018fa8a2200 + commit: 90a8fc91d35c578c3b52ad296a6f1df715da2278 - github: kazu-yamamoto/http2 commit: f5525b755ff2418e6e6ecc69e877363b0d0bcaeb # - ../direct-sqlcipher From e037bb8fb3e7beb97961f36876e98c3db387c652 Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com> Date: Sat, 2 Dec 2023 16:34:20 +0000 Subject: [PATCH 2/3] Revert "core: expand ranges to fit ghc 8.10 & 9.6 (#3496)" This reverts commit 9a1c7f41f770df72891c4fd6a3f459a9062bfd42. --- cabal.project | 7 +++- package.yaml | 12 +++--- scripts/nix/sha256map.nix | 3 +- simplex-chat.cabal | 84 +++++++++++++++++++-------------------- stack.yaml | 4 +- 5 files changed, 59 insertions(+), 51 deletions(-) diff --git a/cabal.project b/cabal.project index 026f963f7a..7190c6183b 100644 --- a/cabal.project +++ b/cabal.project @@ -9,7 +9,7 @@ constraints: zip +disable-bzip2 +disable-zstd source-repository-package type: git location: https://github.com/simplex-chat/simplexmq.git - tag: 90a8fc91d35c578c3b52ad296a6f1df715da2278 + tag: 6bffcc8503e5193d57e543ac0100712a8e27d454 source-repository-package type: git @@ -45,3 +45,8 @@ source-repository-package type: git location: https://github.com/simplex-chat/android-support.git tag: 9aa09f148089d6752ce563b14c2df1895718d806 + +source-repository-package + type: git + location: https://github.com/simplex-chat/network-transport.git + tag: 0013798272a683e35ca38d2fdaf480942311fba8 diff --git a/package.yaml b/package.yaml index 7c828ed7d5..145b178c47 100644 --- a/package.yaml +++ b/package.yaml @@ -32,10 +32,10 @@ dependencies: - filepath == 1.4.* - http-types == 0.12.* - http2 >= 4.2.2 && < 4.3 - - memory >= 0.15 && < 0.19 - - mtl >= 2.2 && < 3 + - memory == 0.18.* + - mtl == 2.3.* - network >= 3.1.2.7 && < 3.2 - - network-transport >= 0.5.6 && < 0.6 + - network-transport == 0.5.6 - optparse-applicative >= 0.15 && < 0.17 - process == 1.6.* - random >= 1.1 && < 1.3 @@ -45,14 +45,14 @@ dependencies: - socks == 0.6.* - sqlcipher-simple == 0.4.* - stm == 2.5.* - - template-haskell >= 2.16 && < 2.21 + - template-haskell == 2.20.* - terminal == 0.2.* - - text >= 2.0 && < 3 + - text == 2.0.* - time == 1.9.* - tls >= 1.6.0 && < 1.7 - unliftio == 0.2.* - unliftio-core == 0.2.* - - zip >= 1.7 && < 2.1 + - zip == 2.0.* flags: swift: diff --git a/scripts/nix/sha256map.nix b/scripts/nix/sha256map.nix index 15a4b04ec1..004187e88c 100644 --- a/scripts/nix/sha256map.nix +++ b/scripts/nix/sha256map.nix @@ -1,5 +1,5 @@ { - "https://github.com/simplex-chat/simplexmq.git"."90a8fc91d35c578c3b52ad296a6f1df715da2278" = "1yjixh6b2s1law3kh885fsbr1inv1r7iy4g9g2bn6j4ygdn8vlzy"; + "https://github.com/simplex-chat/simplexmq.git"."6bffcc8503e5193d57e543ac0100712a8e27d454" = "131kdcvh01985lnf4azss4rg7swpjjh647c29m95b33hd1f7mf17"; "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38"; "https://github.com/kazu-yamamoto/http2.git"."f5525b755ff2418e6e6ecc69e877363b0d0bcaeb" = "0fyx0047gvhm99ilp212mmz37j84cwrfnpmssib5dw363fyb88b6"; "https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d"; @@ -7,4 +7,5 @@ "https://github.com/simplex-chat/aeson.git"."aab7b5a14d6c5ea64c64dcaee418de1bb00dcc2b" = "0jz7kda8gai893vyvj96fy962ncv8dcsx71fbddyy8zrvc88jfrr"; "https://github.com/simplex-chat/haskell-terminal.git"."f708b00009b54890172068f168bf98508ffcd495" = "0zmq7lmfsk8m340g47g5963yba7i88n4afa6z93sg9px5jv1mijj"; "https://github.com/simplex-chat/android-support.git"."9aa09f148089d6752ce563b14c2df1895718d806" = "0pbf2pf13v2kjzi397nr13f1h3jv0imvsq8rpiyy2qyx5vd50pqn"; + "https://github.com/simplex-chat/network-transport.git"."0013798272a683e35ca38d2fdaf480942311fba8" = "0dnn62apgvc248df0m8ib7phrzn63wm0xs71xvlypv52j6cgwzkb"; } diff --git a/simplex-chat.cabal b/simplex-chat.cabal index 6f7e61eda8..18b5da39a4 100644 --- a/simplex-chat.cabal +++ b/simplex-chat.cabal @@ -184,10 +184,10 @@ library , filepath ==1.4.* , http-types ==0.12.* , http2 >=4.2.2 && <4.3 - , memory >=0.15 && <0.19 - , mtl >=2.2 && <3 + , memory ==0.18.* + , mtl ==2.3.* , network >=3.1.2.7 && <3.2 - , network-transport >=0.5.6 && <0.6 + , network-transport ==0.5.6 , optparse-applicative >=0.15 && <0.17 , process ==1.6.* , random >=1.1 && <1.3 @@ -197,14 +197,14 @@ library , socks ==0.6.* , sqlcipher-simple ==0.4.* , stm ==2.5.* - , template-haskell >=2.16 && <2.21 + , template-haskell ==2.20.* , terminal ==0.2.* - , text >=2.0 && <3 + , text ==2.0.* , time ==1.9.* , tls >=1.6.0 && <1.7 , unliftio ==0.2.* , unliftio-core ==0.2.* - , zip >=1.7 && <2.1 + , zip ==2.0.* default-language: Haskell2010 if flag(swift) cpp-options: -DswiftJSON @@ -236,10 +236,10 @@ executable simplex-bot , filepath ==1.4.* , http-types ==0.12.* , http2 >=4.2.2 && <4.3 - , memory >=0.15 && <0.19 - , mtl >=2.2 && <3 + , memory ==0.18.* + , mtl ==2.3.* , network >=3.1.2.7 && <3.2 - , network-transport >=0.5.6 && <0.6 + , network-transport ==0.5.6 , optparse-applicative >=0.15 && <0.17 , process ==1.6.* , random >=1.1 && <1.3 @@ -250,14 +250,14 @@ executable simplex-bot , socks ==0.6.* , sqlcipher-simple ==0.4.* , stm ==2.5.* - , template-haskell >=2.16 && <2.21 + , template-haskell ==2.20.* , terminal ==0.2.* - , text >=2.0 && <3 + , text ==2.0.* , time ==1.9.* , tls >=1.6.0 && <1.7 , unliftio ==0.2.* , unliftio-core ==0.2.* - , zip >=1.7 && <2.1 + , zip ==2.0.* default-language: Haskell2010 if flag(swift) cpp-options: -DswiftJSON @@ -289,10 +289,10 @@ executable simplex-bot-advanced , filepath ==1.4.* , http-types ==0.12.* , http2 >=4.2.2 && <4.3 - , memory >=0.15 && <0.19 - , mtl >=2.2 && <3 + , memory ==0.18.* + , mtl ==2.3.* , network >=3.1.2.7 && <3.2 - , network-transport >=0.5.6 && <0.6 + , network-transport ==0.5.6 , optparse-applicative >=0.15 && <0.17 , process ==1.6.* , random >=1.1 && <1.3 @@ -303,14 +303,14 @@ executable simplex-bot-advanced , socks ==0.6.* , sqlcipher-simple ==0.4.* , stm ==2.5.* - , template-haskell >=2.16 && <2.21 + , template-haskell ==2.20.* , terminal ==0.2.* - , text >=2.0 && <3 + , text ==2.0.* , time ==1.9.* , tls >=1.6.0 && <1.7 , unliftio ==0.2.* , unliftio-core ==0.2.* - , zip >=1.7 && <2.1 + , zip ==2.0.* default-language: Haskell2010 if flag(swift) cpp-options: -DswiftJSON @@ -344,10 +344,10 @@ executable simplex-broadcast-bot , filepath ==1.4.* , http-types ==0.12.* , http2 >=4.2.2 && <4.3 - , memory >=0.15 && <0.19 - , mtl >=2.2 && <3 + , memory ==0.18.* + , mtl ==2.3.* , network >=3.1.2.7 && <3.2 - , network-transport >=0.5.6 && <0.6 + , network-transport ==0.5.6 , optparse-applicative >=0.15 && <0.17 , process ==1.6.* , random >=1.1 && <1.3 @@ -358,14 +358,14 @@ executable simplex-broadcast-bot , socks ==0.6.* , sqlcipher-simple ==0.4.* , stm ==2.5.* - , template-haskell >=2.16 && <2.21 + , template-haskell ==2.20.* , terminal ==0.2.* - , text >=2.0 && <3 + , text ==2.0.* , time ==1.9.* , tls >=1.6.0 && <1.7 , unliftio ==0.2.* , unliftio-core ==0.2.* - , zip >=1.7 && <2.1 + , zip ==2.0.* default-language: Haskell2010 if flag(swift) cpp-options: -DswiftJSON @@ -398,10 +398,10 @@ executable simplex-chat , filepath ==1.4.* , http-types ==0.12.* , http2 >=4.2.2 && <4.3 - , memory >=0.15 && <0.19 - , mtl >=2.2 && <3 + , memory ==0.18.* + , mtl ==2.3.* , network ==3.1.* - , network-transport >=0.5.6 && <0.6 + , network-transport ==0.5.6 , optparse-applicative >=0.15 && <0.17 , process ==1.6.* , random >=1.1 && <1.3 @@ -412,15 +412,15 @@ executable simplex-chat , socks ==0.6.* , sqlcipher-simple ==0.4.* , stm ==2.5.* - , template-haskell >=2.16 && <2.21 + , template-haskell ==2.20.* , terminal ==0.2.* - , text >=2.0 && <3 + , text ==2.0.* , time ==1.9.* , tls >=1.6.0 && <1.7 , unliftio ==0.2.* , unliftio-core ==0.2.* , websockets ==0.12.* - , zip >=1.7 && <2.1 + , zip ==2.0.* default-language: Haskell2010 if flag(swift) cpp-options: -DswiftJSON @@ -456,10 +456,10 @@ executable simplex-directory-service , filepath ==1.4.* , http-types ==0.12.* , http2 >=4.2.2 && <4.3 - , memory >=0.15 && <0.19 - , mtl >=2.2 && <3 + , memory ==0.18.* + , mtl ==2.3.* , network >=3.1.2.7 && <3.2 - , network-transport >=0.5.6 && <0.6 + , network-transport ==0.5.6 , optparse-applicative >=0.15 && <0.17 , process ==1.6.* , random >=1.1 && <1.3 @@ -470,14 +470,14 @@ executable simplex-directory-service , socks ==0.6.* , sqlcipher-simple ==0.4.* , stm ==2.5.* - , template-haskell >=2.16 && <2.21 + , template-haskell ==2.20.* , terminal ==0.2.* - , text >=2.0 && <3 + , text ==2.0.* , time ==1.9.* , tls >=1.6.0 && <1.7 , unliftio ==0.2.* , unliftio-core ==0.2.* - , zip >=1.7 && <2.1 + , zip ==2.0.* default-language: Haskell2010 if flag(swift) cpp-options: -DswiftJSON @@ -540,10 +540,10 @@ test-suite simplex-chat-test , hspec ==2.11.* , http-types ==0.12.* , http2 >=4.2.2 && <4.3 - , memory >=0.15 && <0.19 - , mtl >=2.2 && <3 + , memory ==0.18.* + , mtl ==2.3.* , network ==3.1.* - , network-transport >=0.5.6 && <0.6 + , network-transport ==0.5.6 , optparse-applicative >=0.15 && <0.17 , process ==1.6.* , random >=1.1 && <1.3 @@ -555,14 +555,14 @@ test-suite simplex-chat-test , socks ==0.6.* , sqlcipher-simple ==0.4.* , stm ==2.5.* - , template-haskell >=2.16 && <2.21 + , template-haskell ==2.20.* , terminal ==0.2.* - , text >=2.0 && <3 + , text ==2.0.* , time ==1.9.* , tls >=1.6.0 && <1.7 , unliftio ==0.2.* , unliftio-core ==0.2.* - , zip >=1.7 && <2.1 + , zip ==2.0.* default-language: Haskell2010 if flag(swift) cpp-options: -DswiftJSON diff --git a/stack.yaml b/stack.yaml index 2866c9bfa0..66e89de6fd 100644 --- a/stack.yaml +++ b/stack.yaml @@ -49,7 +49,7 @@ extra-deps: # - simplexmq-1.0.0@sha256:34b2004728ae396e3ae449cd090ba7410781e2b3cefc59259915f4ca5daa9ea8,8561 # - ../simplexmq - github: simplex-chat/simplexmq - commit: 90a8fc91d35c578c3b52ad296a6f1df715da2278 + commit: 6bffcc8503e5193d57e543ac0100712a8e27d454 - github: kazu-yamamoto/http2 commit: f5525b755ff2418e6e6ecc69e877363b0d0bcaeb # - ../direct-sqlcipher @@ -65,6 +65,8 @@ extra-deps: commit: f708b00009b54890172068f168bf98508ffcd495 - github: simplex-chat/android-support commit: 9aa09f148089d6752ce563b14c2df1895718d806 + - github: simplex-chat/network-transport + commit: 0013798272a683e35ca38d2fdaf480942311fba8 # # extra-deps: [] From 302dda8cd61911780c71b6420d14b7b378358003 Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com> Date: Sat, 2 Dec 2023 16:41:35 +0000 Subject: [PATCH 3/3] update simplexmq --- cabal.project | 2 +- scripts/nix/sha256map.nix | 2 +- stack.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cabal.project b/cabal.project index 7190c6183b..7c1e6a8086 100644 --- a/cabal.project +++ b/cabal.project @@ -9,7 +9,7 @@ constraints: zip +disable-bzip2 +disable-zstd source-repository-package type: git location: https://github.com/simplex-chat/simplexmq.git - tag: 6bffcc8503e5193d57e543ac0100712a8e27d454 + tag: ee5e9f7b6ef88c8fa666a4b7a9478f3d6758e457 source-repository-package type: git diff --git a/scripts/nix/sha256map.nix b/scripts/nix/sha256map.nix index 004187e88c..84577968c2 100644 --- a/scripts/nix/sha256map.nix +++ b/scripts/nix/sha256map.nix @@ -1,5 +1,5 @@ { - "https://github.com/simplex-chat/simplexmq.git"."6bffcc8503e5193d57e543ac0100712a8e27d454" = "131kdcvh01985lnf4azss4rg7swpjjh647c29m95b33hd1f7mf17"; + "https://github.com/simplex-chat/simplexmq.git"."ee5e9f7b6ef88c8fa666a4b7a9478f3d6758e457" = "066gw885wb7izlidh7mgk91dp4h0crg9dpsmrj845pjaicj2kwpk"; "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38"; "https://github.com/kazu-yamamoto/http2.git"."f5525b755ff2418e6e6ecc69e877363b0d0bcaeb" = "0fyx0047gvhm99ilp212mmz37j84cwrfnpmssib5dw363fyb88b6"; "https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d"; diff --git a/stack.yaml b/stack.yaml index 66e89de6fd..0fb0d17f7d 100644 --- a/stack.yaml +++ b/stack.yaml @@ -49,7 +49,7 @@ extra-deps: # - simplexmq-1.0.0@sha256:34b2004728ae396e3ae449cd090ba7410781e2b3cefc59259915f4ca5daa9ea8,8561 # - ../simplexmq - github: simplex-chat/simplexmq - commit: 6bffcc8503e5193d57e543ac0100712a8e27d454 + commit: ee5e9f7b6ef88c8fa666a4b7a9478f3d6758e457 - github: kazu-yamamoto/http2 commit: f5525b755ff2418e6e6ecc69e877363b0d0bcaeb # - ../direct-sqlcipher