From 883b2a917a068d19e0238acfc71fbd0b2a34f79f Mon Sep 17 00:00:00 2001
From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Date: Sat, 2 Dec 2023 19:15:25 +0000
Subject: [PATCH 1/2] simplexmq

---
 cabal.project             |  8 +++++++-
 scripts/nix/sha256map.nix |  3 ++-
 stack.yaml                | 10 +++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/cabal.project b/cabal.project
index 9cb9ad9c8..e288a6d4e 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: ee5e9f7b6ef88c8fa666a4b7a9478f3d6758e457
+    tag: 140b4b12bdee809bcb5484101b5f1b753c744b51
 
 source-repository-package
     type: git
@@ -45,3 +45,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
diff --git a/scripts/nix/sha256map.nix b/scripts/nix/sha256map.nix
index c1a540ab5..ece2f766e 100644
--- a/scripts/nix/sha256map.nix
+++ b/scripts/nix/sha256map.nix
@@ -1,5 +1,5 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."ee5e9f7b6ef88c8fa666a4b7a9478f3d6758e457" = "066gw885wb7izlidh7mgk91dp4h0crg9dpsmrj845pjaicj2kwpk";
+  "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"."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/zip.git"."bd421c6b19cc4c465cd7af1f6f26169fb8ee1ebc" = "1csqfjhvc8wb5h4kxxndmb6iw7b4ib9ff2n81hrizsmnf45a6gg0";
 }
diff --git a/stack.yaml b/stack.yaml
index 0fb0d17f7..f0568d8ed 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -49,9 +49,9 @@ extra-deps:
   # - simplexmq-1.0.0@sha256:34b2004728ae396e3ae449cd090ba7410781e2b3cefc59259915f4ca5daa9ea8,8561
   # - ../simplexmq
   - github: simplex-chat/simplexmq
-    commit: ee5e9f7b6ef88c8fa666a4b7a9478f3d6758e457
-  - github: kazu-yamamoto/http2
-    commit: f5525b755ff2418e6e6ecc69e877363b0d0bcaeb
+    commit: 140b4b12bdee809bcb5484101b5f1b753c744b51
+  - github: simplex-chat/hs-socks
+    commit: a30cc7a79a08d8108316094f8f2f82a0c5e1ac51
   # - ../direct-sqlcipher
   - github: simplex-chat/direct-sqlcipher
     commit: f814ee68b16a9447fbb467ccc8f29bdd3546bfd9
@@ -65,8 +65,8 @@ extra-deps:
     commit: f708b00009b54890172068f168bf98508ffcd495
   - github: simplex-chat/android-support
     commit: 9aa09f148089d6752ce563b14c2df1895718d806
-  - github: simplex-chat/network-transport
-    commit: 0013798272a683e35ca38d2fdaf480942311fba8
+  - github: simplex-chat/zip
+    commit: bd421c6b19cc4c465cd7af1f6f26169fb8ee1ebc
 #
 # extra-deps: []
 

From 52247e47191ccc10326141f7b9fa1ff43050a806 Mon Sep 17 00:00:00 2001
From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Date: Sat, 2 Dec 2023 19:18:23 +0000
Subject: [PATCH 2/2] fix test

---
 tests/RemoteTests.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/RemoteTests.hs b/tests/RemoteTests.hs
index f03e19149..13bc2942f 100644
--- a/tests/RemoteTests.hs
+++ b/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