switch aeson

This reverts commit 9a1c7f41f7.

apps/simplex-bot-advanced/Main.hs

@@ -8,7 +8,7 @@ module Main where
 
 import Control.Concurrent.Async
 import Control.Concurrent.STM
-import Control.Monad.Reader
+import Control.Monad
 import qualified Data.Text as T
 import Simplex.Chat.Bot
 import Simplex.Chat.Controller

apps/simplex-broadcast-bot/src/Broadcast/Bot.hs

@@ -9,7 +9,7 @@ module Broadcast.Bot where
 import Control.Concurrent (forkIO)
 import Control.Concurrent.Async
 import Control.Concurrent.STM
-import Control.Monad.Reader
+import Control.Monad
 import qualified Data.Text as T
 import Broadcast.Options
 import Simplex.Chat.Bot

apps/simplex-chat/Server.hs

@@ -8,6 +8,7 @@
 
 module Server where
 
+import Control.Monad
 import Control.Monad.Except
 import Control.Monad.Reader
 import Data.Aeson (FromJSON, ToJSON)

apps/simplex-directory-service/src/Directory/Service.hs

@@ -15,7 +15,7 @@ where
 import Control.Concurrent (forkIO)
 import Control.Concurrent.Async
 import Control.Concurrent.STM
-import Control.Monad.Reader
+import Control.Monad
 import qualified Data.ByteString.Char8 as B
 import Data.List (sortOn)
 import Data.Maybe (fromMaybe, maybeToList)

cabal.project

@@ -4,12 +4,14 @@ packages: .
 
 with-compiler: ghc-8.10.7
 
+index-state: 2023-10-06T00:00:00Z
+
 constraints: zip +disable-bzip2 +disable-zstd
 
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/simplexmq.git
-    tag: 117168ccce93ef5ac478c02e3f02a018fa8a2200
+    tag: 140b4b12bdee809bcb5484101b5f1b753c744b51
 
 source-repository-package
     type: git
@@ -24,12 +26,12 @@ source-repository-package
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/direct-sqlcipher.git
-    tag: 34309410eb2069b029b8fc1872deb1e0db123294
+    tag: f814ee68b16a9447fbb467ccc8f29bdd3546bfd9
 
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/sqlcipher-simple.git
-    tag: 5e154a2aeccc33ead6c243ec07195ab673137221
+    tag: a46bd361a19376c5211f1058908fc0ae6bf42446
 
 source-repository-package
     type: git
@@ -45,3 +47,9 @@ source-repository-package
     type: git
     location: https://github.com/simplex-chat/android-support.git
     tag: 9aa09f148089d6752ce563b14c2df1895718d806
+
+-- TODO this fork is only needed to compile with GHC 8.10.7 - it allows previous base version
+source-repository-package
+    type: git
+    location: https://github.com/simplex-chat/zip.git
+    tag: bd421c6b19cc4c465cd7af1f6f26169fb8ee1ebc

cabal.project.freeze

@@ -0,0 +1,233 @@
+active-repositories: hackage.haskell.org:merge
+constraints: any.Cabal ==3.10.1.0,
+             any.Cabal-syntax ==3.10.1.0,
+             any.HUnit ==1.6.2.0,
+             any.OneTuple ==0.4.1.1,
+             any.Only ==0.1,
+             any.QuickCheck ==2.14.3,
+             QuickCheck -old-random +templatehaskell,
+             any.SHA ==1.6.4.4,
+             SHA -exe,
+             any.StateVar ==1.2.2,
+             any.aeson ==2.1.2.1,
+             aeson +ordered-keymap,
+             any.android-support ==0.1.0.0,
+             any.ansi-terminal ==0.11.5,
+             ansi-terminal -example +win32-2-13-1,
+             any.ansi-terminal-types ==0.11.5,
+             any.ansi-wl-pprint ==0.6.9,
+             ansi-wl-pprint -example,
+             any.appar ==0.1.8,
+             any.array ==0.5.4.0,
+             any.asn1-encoding ==0.9.6,
+             any.asn1-parse ==0.9.5,
+             any.asn1-types ==0.3.4,
+             any.assoc ==1.1,
+             assoc +tagged,
+             any.async ==2.2.4,
+             async -bench,
+             any.attoparsec ==0.14.4,
+             attoparsec -developer,
+             any.auto-update ==0.1.6,
+             any.base ==4.14.3.0,
+             any.base-orphans ==0.9.0,
+             any.base64-bytestring ==1.2.1.0,
+             any.basement ==0.0.16,
+             any.bifunctors ==5.6.1,
+             bifunctors +tagged,
+             any.binary ==0.8.9.1,
+             any.bitvec ==1.1.5.0,
+             bitvec +simd,
+             any.blaze-builder ==0.4.2.3,
+             any.blaze-textual ==0.2.3.1,
+             blaze-textual -developer -integer-simple +native,
+             any.byteorder ==1.0.4,
+             any.bytestring ==0.11.5.2,
+             any.bytestring-builder ==0.10.8.2.0,
+             bytestring-builder +bytestring_has_builder,
+             any.call-stack ==0.4.0,
+             any.case-insensitive ==1.2.1.0,
+             any.cereal ==0.5.8.3,
+             cereal -bytestring-builder,
+             any.clock ==0.8.4,
+             clock -llvm,
+             any.colour ==2.3.6,
+             any.comonad ==5.0.8,
+             comonad +containers +distributive +indexed-traversable,
+             any.composition ==1.0.2.2,
+             any.conduit ==1.3.5,
+             any.conduit-extra ==1.3.6,
+             any.constraints ==0.13.4,
+             any.containers ==0.6.5.1,
+             any.contravariant ==1.5.5,
+             contravariant +semigroups +statevar +tagged,
+             any.cryptonite ==0.30,
+             cryptonite -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq -support_pclmuldq +support_rdrand -support_sse +use_target_attributes,
+             any.cryptostore ==0.2.3.0,
+             any.data-array-byte ==0.1.0.1,
+             any.data-default ==0.7.1.1,
+             any.data-default-class ==0.1.2.0,
+             any.data-default-instances-containers ==0.0.1,
+             any.data-default-instances-dlist ==0.0.1,
+             any.data-default-instances-old-locale ==0.0.1,
+             any.data-fix ==0.3.2,
+             any.deepseq ==1.4.4.0,
+             any.digest ==0.0.1.7,
+             digest +pkg-config,
+             any.direct-sqlcipher ==2.3.28,
+             direct-sqlcipher -commoncrypto +fulltextsearch +haveusleep +json1 -mathfunctions -openssl -systemlib -tomcrypt +urifilenames,
+             any.directory ==1.3.7.1,
+             any.distributive ==0.6.2.1,
+             distributive +semigroups +tagged,
+             any.dlist ==1.0,
+             dlist -werror,
+             any.easy-file ==0.2.5,
+             any.email-validate ==2.3.2.19,
+             any.entropy ==0.4.1.10,
+             entropy -donotgetentropy,
+             any.exceptions ==0.10.7,
+             exceptions +transformers-0-4,
+             any.fast-logger ==3.2.2,
+             any.filepath ==1.4.2.1,
+             any.foldable1-classes-compat ==0.1,
+             foldable1-classes-compat +tagged,
+             any.generic-random ==1.5.0.1,
+             generic-random -enable-inspect,
+             any.generically ==0.1.1,
+             any.ghc-boot-th ==8.10.7,
+             any.ghc-prim ==0.6.1,
+             any.hashable ==1.4.3.0,
+             hashable +integer-gmp -random-initial-seed,
+             any.hourglass ==0.2.12,
+             any.hsc2hs ==0.68.10,
+             hsc2hs -in-ghc-tree,
+             any.hspec ==2.7.10,
+             any.hspec-core ==2.7.10,
+             any.hspec-discover ==2.7.10,
+             any.hspec-expectations ==0.8.2,
+             any.http-types ==0.12.3,
+             any.http2 ==4.2.2,
+             http2 -devel -h2spec,
+             any.indexed-traversable ==0.1.3,
+             any.indexed-traversable-instances ==0.1.1.2,
+             any.ini ==0.4.1,
+             any.integer-conversion ==0.1.0.1,
+             any.integer-gmp ==1.0.3.0,
+             any.integer-logarithms ==1.0.3.1,
+             integer-logarithms -check-bounds +integer-gmp,
+             any.iproute ==1.7.12,
+             any.iso8601-time ==0.1.5,
+             iso8601-time +new-time,
+             any.libyaml ==0.1.2,
+             libyaml -no-unicode -system-libyaml,
+             any.lifted-base ==0.2.3.12,
+             any.memory ==0.18.0,
+             memory +support_bytestring +support_deepseq,
+             any.monad-control ==1.0.3.1,
+             any.monad-logger ==0.3.40,
+             monad-logger +template_haskell,
+             any.monad-loops ==0.4.3,
+             monad-loops +base4,
+             any.mono-traversable ==1.0.15.3,
+             any.mtl ==2.3.1,
+             any.network ==3.1.4.0,
+             network -devel,
+             any.network-byte-order ==0.1.6,
+             any.network-info ==0.2.1,
+             any.network-transport ==0.5.6,
+             any.network-udp ==0.0.0,
+             any.network-uri ==2.6.4.2,
+             any.old-locale ==1.0.0.7,
+             any.old-time ==1.1.0.3,
+             any.optparse-applicative ==0.16.1.0,
+             optparse-applicative +process,
+             any.parsec ==3.1.17.0,
+             any.pem ==0.2.4,
+             any.pretty ==1.1.3.6,
+             any.prettyprinter ==1.7.1,
+             prettyprinter -buildreadme +text,
+             any.primitive ==0.8.0.0,
+             any.process ==1.6.18.0,
+             any.psqueues ==0.2.7.3,
+             any.quickcheck-io ==0.2.0,
+             any.random ==1.2.1.1,
+             any.record-hasfield ==1.0,
+             any.resourcet ==1.3.0,
+             any.rts ==1.0.1,
+             any.safe-exceptions ==0.1.7.4,
+             any.scientific ==0.3.7.0,
+             scientific -bytestring-builder -integer-simple,
+             any.semialign ==1.3,
+             semialign +semigroupoids,
+             any.semigroupoids ==6.0.0.1,
+             semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers,
+             any.setenv ==0.1.1.3,
+             any.silently ==1.2.5.3,
+             any.simple-logger ==0.1.1,
+             simplex-chat -swift,
+             any.simplexmq ==5.4.0.7,
+             simplexmq -swift,
+             any.socks ==0.6.1,
+             any.split ==0.2.3.5,
+             any.splitmix ==0.1.0.5,
+             splitmix -optimised-mixer,
+             any.sqlcipher-simple ==0.4.18.1,
+             any.stm ==2.5.0.1,
+             any.stm-chans ==3.0.0.9,
+             any.streaming-commons ==0.2.2.6,
+             streaming-commons -use-bytestring-builder,
+             any.strict ==0.5,
+             any.tagged ==0.8.8,
+             tagged +deepseq +transformers,
+             any.template-haskell ==2.16.0.0,
+             any.temporary ==1.3,
+             any.terminal ==0.2.0.0,
+             any.text ==2.0,
+             text -developer +simdutf,
+             any.text-iso8601 ==0.1,
+             any.text-short ==0.1.5,
+             text-short -asserts,
+             any.tf-random ==0.5,
+             any.th-abstraction ==0.6.0.0,
+             any.th-compat ==0.1.4,
+             any.these ==1.2,
+             any.time ==1.9.3,
+             any.time-compat ==1.9.6.1,
+             time-compat -old-locale,
+             any.time-manager ==0.0.1,
+             any.tls ==1.6.0,
+             tls +compat -hans +network,
+             any.transformers ==0.6.1.1,
+             any.transformers-base ==0.4.6,
+             transformers-base +orphaninstances,
+             any.transformers-compat ==0.7.2,
+             transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
+             any.type-equality ==1,
+             any.typed-process ==0.2.11.0,
+             any.unix ==2.7.3,
+             any.unix-compat ==0.7,
+             unix-compat -old-time,
+             any.unix-time ==0.4.11,
+             any.unliftio ==0.2.25.0,
+             any.unliftio-core ==0.2.1.0,
+             any.unordered-containers ==0.2.19.1,
+             unordered-containers -debug,
+             any.uuid-types ==1.0.5.1,
+             any.vector ==0.13.0.0,
+             vector +boundschecks -internalchecks -unsafechecks -wall,
+             any.vector-algorithms ==0.9.0.1,
+             vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks,
+             any.vector-stream ==0.1.0.0,
+             any.websockets ==0.12.7.3,
+             websockets -example,
+             any.witherable ==0.4.2,
+             any.x509 ==1.7.7,
+             any.x509-store ==1.6.9,
+             any.x509-validation ==1.6.12,
+             any.yaml ==0.11.11.2,
+             yaml +no-examples +no-exe,
+             any.zip ==2.0.0,
+             zip -dev +disable-bzip2 +disable-zstd,
+             any.zlib ==0.6.3.0,
+             zlib -bundled-c-zlib -non-blocking-ffi -pkg-config
+index-state: hackage.haskell.org 2023-10-05T21:19:55Z

package.yaml

@@ -19,11 +19,11 @@ dependencies:
   - attoparsec == 0.14.*
   - base >= 4.7 && < 5
   - base64-bytestring >= 1.0 && < 1.3
-  - bytestring == 0.10.*
+  - bytestring == 0.11.*
   - composition == 1.0.*
   - constraints >= 0.12 && < 0.14
   - containers == 0.6.*
-  - cryptonite >= 0.27 && < 0.30
+  - cryptonite == 0.30.*
   - data-default >= 0.7 && < 0.8
   - directory == 1.3.*
   - direct-sqlcipher == 2.3.*
@@ -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.3.1 && < 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
@@ -47,12 +47,12 @@ dependencies:
   - stm == 2.5.*
   - template-haskell >= 2.16 && < 2.21
   - 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:

scripts/nix/sha256map.nix

@@ -1,10 +1,11 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."117168ccce93ef5ac478c02e3f02a018fa8a2200" = "1091c4b8qjp9v29z862b7clda90w3kb4v2aqp5b2jh6yprlga98w";
+  "https://github.com/simplex-chat/simplexmq.git"."140b4b12bdee809bcb5484101b5f1b753c744b51" = "19ardk84b25bh22aab0rjvlar966db2wc8hhin1kyh4m66dy92kx";
   "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"."34309410eb2069b029b8fc1872deb1e0db123294" = "0kwkmhyfsn2lixdlgl15smgr1h5gjk7fky6abzh8rng2h5ymnffd";
-  "https://github.com/simplex-chat/sqlcipher-simple.git"."5e154a2aeccc33ead6c243ec07195ab673137221" = "1d1gc5wax4vqg0801ajsmx1sbwvd9y7p7b8mmskvqsmpbwgbh0m0";
+  "https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d";
+  "https://github.com/simplex-chat/sqlcipher-simple.git"."a46bd361a19376c5211f1058908fc0ae6bf42446" = "1z0r78d8f0812kxbgsm735qf6xx8lvaz27k1a0b4a2m0sshpd5gl";
   "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/zip.git"."bd421c6b19cc4c465cd7af1f6f26169fb8ee1ebc" = "1csqfjhvc8wb5h4kxxndmb6iw7b4ib9ff2n81hrizsmnf45a6gg0";
 }

simplex-chat.cabal

@@ -171,11 +171,11 @@ library
     , attoparsec ==0.14.*
     , base >=4.7 && <5
     , base64-bytestring >=1.0 && <1.3
-    , bytestring ==0.10.*
+    , bytestring ==0.11.*
     , composition ==1.0.*
     , constraints >=0.12 && <0.14
     , containers ==0.6.*
-    , cryptonite >=0.27 && <0.30
+    , cryptonite ==0.30.*
     , data-default ==0.7.*
     , direct-sqlcipher ==2.3.*
     , directory ==1.3.*
@@ -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.3.1 && <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
@@ -199,12 +199,12 @@ library
     , stm ==2.5.*
     , template-haskell >=2.16 && <2.21
     , 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
@@ -223,11 +223,11 @@ executable simplex-bot
     , attoparsec ==0.14.*
     , base >=4.7 && <5
     , base64-bytestring >=1.0 && <1.3
-    , bytestring ==0.10.*
+    , bytestring ==0.11.*
     , composition ==1.0.*
     , constraints >=0.12 && <0.14
     , containers ==0.6.*
-    , cryptonite >=0.27 && <0.30
+    , cryptonite ==0.30.*
     , data-default ==0.7.*
     , direct-sqlcipher ==2.3.*
     , directory ==1.3.*
@@ -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.3.1 && <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
@@ -252,12 +252,12 @@ executable simplex-bot
     , stm ==2.5.*
     , template-haskell >=2.16 && <2.21
     , 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
@@ -276,11 +276,11 @@ executable simplex-bot-advanced
     , attoparsec ==0.14.*
     , base >=4.7 && <5
     , base64-bytestring >=1.0 && <1.3
-    , bytestring ==0.10.*
+    , bytestring ==0.11.*
     , composition ==1.0.*
     , constraints >=0.12 && <0.14
     , containers ==0.6.*
-    , cryptonite >=0.27 && <0.30
+    , cryptonite ==0.30.*
     , data-default ==0.7.*
     , direct-sqlcipher ==2.3.*
     , directory ==1.3.*
@@ -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.3.1 && <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
@@ -305,12 +305,12 @@ executable simplex-bot-advanced
     , stm ==2.5.*
     , template-haskell >=2.16 && <2.21
     , 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
@@ -331,11 +331,11 @@ executable simplex-broadcast-bot
     , attoparsec ==0.14.*
     , base >=4.7 && <5
     , base64-bytestring >=1.0 && <1.3
-    , bytestring ==0.10.*
+    , bytestring ==0.11.*
     , composition ==1.0.*
     , constraints >=0.12 && <0.14
     , containers ==0.6.*
-    , cryptonite >=0.27 && <0.30
+    , cryptonite ==0.30.*
     , data-default ==0.7.*
     , direct-sqlcipher ==2.3.*
     , directory ==1.3.*
@@ -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.3.1 && <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
@@ -360,12 +360,12 @@ executable simplex-broadcast-bot
     , stm ==2.5.*
     , template-haskell >=2.16 && <2.21
     , 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
@@ -385,11 +385,11 @@ executable simplex-chat
     , attoparsec ==0.14.*
     , base >=4.7 && <5
     , base64-bytestring >=1.0 && <1.3
-    , bytestring ==0.10.*
+    , bytestring ==0.11.*
     , composition ==1.0.*
     , constraints >=0.12 && <0.14
     , containers ==0.6.*
-    , cryptonite >=0.27 && <0.30
+    , cryptonite ==0.30.*
     , data-default ==0.7.*
     , direct-sqlcipher ==2.3.*
     , directory ==1.3.*
@@ -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.3.1 && <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
@@ -414,13 +414,13 @@ executable simplex-chat
     , stm ==2.5.*
     , template-haskell >=2.16 && <2.21
     , 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
@@ -443,11 +443,11 @@ executable simplex-directory-service
     , attoparsec ==0.14.*
     , base >=4.7 && <5
     , base64-bytestring >=1.0 && <1.3
-    , bytestring ==0.10.*
+    , bytestring ==0.11.*
     , composition ==1.0.*
     , constraints >=0.12 && <0.14
     , containers ==0.6.*
-    , cryptonite >=0.27 && <0.30
+    , cryptonite ==0.30.*
     , data-default ==0.7.*
     , direct-sqlcipher ==2.3.*
     , directory ==1.3.*
@@ -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.3.1 && <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
@@ -472,12 +472,12 @@ executable simplex-directory-service
     , stm ==2.5.*
     , template-haskell >=2.16 && <2.21
     , 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
@@ -524,11 +524,11 @@ test-suite simplex-chat-test
     , attoparsec ==0.14.*
     , base >=4.7 && <5
     , base64-bytestring >=1.0 && <1.3
-    , bytestring ==0.10.*
+    , bytestring ==0.11.*
     , composition ==1.0.*
     , constraints >=0.12 && <0.14
     , containers ==0.6.*
-    , cryptonite >=0.27 && <0.30
+    , cryptonite ==0.30.*
     , data-default ==0.7.*
     , deepseq ==1.4.*
     , direct-sqlcipher ==2.3.*
@@ -540,10 +540,10 @@ test-suite simplex-chat-test
     , hspec ==2.7.*
     , http-types ==0.12.*
     , http2 >=4.2.2 && <4.3
-    , memory >=0.15 && <0.19
-    , mtl >=2.3.1 && <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
@@ -557,12 +557,12 @@ test-suite simplex-chat-test
     , stm ==2.5.*
     , template-haskell >=2.16 && <2.21
     , 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

src/Simplex/Chat.hs

@@ -18,6 +18,7 @@ module Simplex.Chat where
 import Control.Applicative (optional, (<|>))
 import Control.Concurrent.STM (retry)
 import Control.Logger.Simple
+import Control.Monad
 import Control.Monad.Except
 import Control.Monad.IO.Unlift
 import Control.Monad.Reader

src/Simplex/Chat/Archive.hs

@@ -14,6 +14,7 @@ module Simplex.Chat.Archive
 where
 
 import qualified Codec.Archive.Zip as Z
+import Control.Monad
 import Control.Monad.Except
 import Control.Monad.Reader
 import Data.Functor (($>))

src/Simplex/Chat/Bot.hs

@@ -8,6 +8,7 @@ module Simplex.Chat.Bot where
 
 import Control.Concurrent.Async
 import Control.Concurrent.STM
+import Control.Monad
 import Control.Monad.Reader
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Text as T

src/Simplex/Chat/Mobile/File.hs

@@ -16,6 +16,7 @@ module Simplex.Chat.Mobile.File
   )
 where
 
+import Control.Monad
 import Control.Monad.Except
 import Control.Monad.IO.Class
 import qualified Data.Aeson as J

src/Simplex/Chat/Mobile/WebRTC.hs

@@ -8,7 +8,9 @@ module Simplex.Chat.Mobile.WebRTC
     reservedSize,
   ) where
 
+import Control.Monad
 import Control.Monad.Except
+import Control.Monad.IO.Class
 import qualified Crypto.Cipher.Types as AES
 import Data.Bifunctor (bimap)
 import qualified Data.ByteArray as BA

src/Simplex/Chat/Store/Connections.hs

@@ -16,6 +16,7 @@ module Simplex.Chat.Store.Connections
 where
 
 import Control.Applicative ((<|>))
+import Control.Monad
 import Control.Monad.Except
 import Data.Int (Int64)
 import Data.Maybe (catMaybes, fromMaybe)

src/Simplex/Chat/Store/Direct.hs

@@ -66,7 +66,9 @@ module Simplex.Chat.Store.Direct
   )
 where
 
+import Control.Monad
 import Control.Monad.Except
+import Control.Monad.IO.Class
 import Data.Either (rights)
 import Data.Functor (($>))
 import Data.Int (Int64)

src/Simplex/Chat/Store/Files.hs

@@ -77,7 +77,9 @@ module Simplex.Chat.Store.Files
 where
 
 import Control.Applicative ((<|>))
+import Control.Monad
 import Control.Monad.Except
+import Control.Monad.IO.Class
 import Data.Either (rights)
 import Data.Int (Int64)
 import Data.Maybe (fromMaybe, isJust, listToMaybe)

src/Simplex/Chat/Store/Groups.hs

@@ -113,7 +113,9 @@ module Simplex.Chat.Store.Groups
   )
 where
 
+import Control.Monad
 import Control.Monad.Except
+import Control.Monad.IO.Class
 import Crypto.Random (ChaChaDRG)
 import Data.Either (rights)
 import Data.Int (Int64)

src/Simplex/Chat/Store/Messages.hs

@@ -101,7 +101,9 @@ module Simplex.Chat.Store.Messages
   )
 where
 
+import Control.Monad
 import Control.Monad.Except
+import Control.Monad.IO.Class
 import Crypto.Random (ChaChaDRG)
 import Data.Bifunctor (first)
 import Data.ByteString.Char8 (ByteString)

src/Simplex/Chat/Store/Profiles.hs

@@ -59,6 +59,7 @@ module Simplex.Chat.Store.Profiles
   )
 where
 
+import Control.Monad
 import Control.Monad.Except
 import Control.Monad.IO.Class
 import qualified Data.Aeson.TH as J

src/Simplex/Chat/Store/Shared.hs

@@ -12,7 +12,9 @@ module Simplex.Chat.Store.Shared where
 
 import Control.Exception (Exception)
 import qualified Control.Exception as E
+import Control.Monad
 import Control.Monad.Except
+import Control.Monad.IO.Class
 import Crypto.Random (ChaChaDRG, randomBytesGenerate)
 import qualified Data.Aeson.TH as J
 import qualified Data.ByteString.Base64 as B64

src/Simplex/Chat/Terminal.hs

@@ -5,6 +5,7 @@
 module Simplex.Chat.Terminal where
 
 import Control.Exception (handle, throwIO)
+import Control.Monad
 import Control.Monad.Except
 import qualified Data.List.NonEmpty as L
 import Database.SQLite.Simple (SQLError (..))

src/Simplex/Chat/Terminal/Input.hs

@@ -12,6 +12,7 @@ module Simplex.Chat.Terminal.Input where
 
 import Control.Applicative (optional, (<|>))
 import Control.Concurrent (forkFinally, forkIO, killThread, mkWeakThreadId, threadDelay)
+import Control.Monad
 import Control.Monad.Except
 import Control.Monad.Reader
 import qualified Data.Attoparsec.ByteString.Char8 as A

src/Simplex/Chat/Util.hs

@@ -2,6 +2,7 @@ module Simplex.Chat.Util (week, encryptFile, chunkSize) where
 
 import Control.Monad
 import Control.Monad.Except
+import Control.Monad.IO.Class
 import qualified Data.ByteString.Lazy as LB
 import Data.Time (NominalDiffTime)
 import Simplex.Messaging.Crypto.File (CryptoFile (..), CryptoFileArgs (..))

stack.yaml

@@ -49,15 +49,15 @@ extra-deps:
   # - simplexmq-1.0.0@sha256:34b2004728ae396e3ae449cd090ba7410781e2b3cefc59259915f4ca5daa9ea8,8561
   # - ../simplexmq
   - github: simplex-chat/simplexmq
-    commit: 117168ccce93ef5ac478c02e3f02a018fa8a2200
-  - github: kazu-yamamoto/http2
-    commit: f5525b755ff2418e6e6ecc69e877363b0d0bcaeb
+    commit: 140b4b12bdee809bcb5484101b5f1b753c744b51
+  - github: simplex-chat/hs-socks
+    commit: a30cc7a79a08d8108316094f8f2f82a0c5e1ac51
   # - ../direct-sqlcipher
   - github: simplex-chat/direct-sqlcipher
-    commit: 34309410eb2069b029b8fc1872deb1e0db123294
+    commit: f814ee68b16a9447fbb467ccc8f29bdd3546bfd9
   # - ../sqlcipher-simple
   - github: simplex-chat/sqlcipher-simple
-    commit: 5e154a2aeccc33ead6c243ec07195ab673137221
+    commit: a46bd361a19376c5211f1058908fc0ae6bf42446
   # - terminal-0.2.0.0@sha256:de6770ecaae3197c66ac1f0db5a80cf5a5b1d3b64a66a05b50f442de5ad39570,2977
   - github: simplex-chat/aeson
     commit: aab7b5a14d6c5ea64c64dcaee418de1bb00dcc2b
@@ -65,6 +65,8 @@ extra-deps:
     commit: f708b00009b54890172068f168bf98508ffcd495
   - github: simplex-chat/android-support
     commit: 9aa09f148089d6752ce563b14c2df1895718d806
+  - github: simplex-chat/zip
+    commit: bd421c6b19cc4c465cd7af1f6f26169fb8ee1ebc
 #
 # extra-deps: []
 

tests/ChatClient.hs

@@ -13,6 +13,7 @@ import Control.Concurrent (forkIOWithUnmask, killThread, threadDelay)
 import Control.Concurrent.Async
 import Control.Concurrent.STM
 import Control.Exception (bracket, bracket_)
+import Control.Monad
 import Control.Monad.Except
 import Data.Functor (($>))
 import Data.List (dropWhileEnd, find)

tests/RemoteTests.hs

@@ -162,13 +162,13 @@ storedBindingsTest = testChat2 aliceProfile aliceDesktopProfile $ \mobile deskto
 
   desktop ##> "/list remote hosts"
   desktop <## "Remote hosts:"
-  desktop <## "1. Mobile (connected) [lo 127.0.0.1:52230]"
+  desktop <##. "1. Mobile (connected) ["
   stopDesktop mobile desktop
   desktop ##> "/list remote hosts"
   desktop <## "Remote hosts:"
-  desktop <## "1. Mobile [lo 127.0.0.1:52230]"
+  desktop <##. "1. Mobile ["
 
-  -- TODO: more parser tests
+-- TODO: more parser tests
 
 remoteMessageTest :: HasCallStack => FilePath -> IO ()
 remoteMessageTest = testChat3 aliceProfile aliceDesktopProfile bobProfile $ \mobile desktop bob -> do