From 575d899f5a49d8322476dca5fa6a9a4911125b0f Mon Sep 17 00:00:00 2001
From: sh <37271604+shumvgolove@users.noreply.github.com>
Date: Tue, 2 Jan 2024 17:39:23 +0300
Subject: [PATCH 1/3] build-android: fix new arrangement of nix command (#3634)

---
 scripts/android/build-android.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/android/build-android.sh b/scripts/android/build-android.sh
index 809f98227..7550cdb87 100755
--- a/scripts/android/build-android.sh
+++ b/scripts/android/build-android.sh
@@ -108,10 +108,13 @@ build() {
 
     if [ "$arch" = "armv7a" ] && [ -n "$tag_full" ] ; then
       git checkout "${tag_version}-armv7a"
+      android_simplex_lib="${folder}#hydraJobs.${arch}-android:lib:simplex-chat.x86_64-linux"
+      android_support_lib="${folder}#hydraJobs.${arch}-android:lib:support.x86_64-linux"
+    else
+      android_simplex_lib="${folder}#hydraJobs.x86_64-linux.${arch}-android:lib:simplex-chat"
+      android_support_lib="${folder}#hydraJobs.x86_64-linux.${arch}-android:lib:support"
     fi
     
-    android_simplex_lib="${folder}#hydraJobs.${arch}-android:lib:simplex-chat.x86_64-linux"
-    android_support_lib="${folder}#hydraJobs.${arch}-android:lib:support.x86_64-linux"
     android_simplex_lib_output="${PWD}/result/pkg-${arch}-android-libsimplex.zip"
     android_support_lib_output="${PWD}/result/pkg-${arch}-android-libsupport.zip"
 

From bb61b9c6580c734911c04c7ec257cdf439df887a Mon Sep 17 00:00:00 2001
From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Date: Fri, 5 Jan 2024 18:51:18 +0000
Subject: [PATCH 2/3] core: update simplexmq (critical errors, worker restarts,
 subscription timeouts)

---
 cabal.project             | 2 +-
 scripts/nix/sha256map.nix | 2 +-
 tests/ChatClient.hs       | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cabal.project b/cabal.project
index baf7d5c4c..fa8f2875d 100644
--- a/cabal.project
+++ b/cabal.project
@@ -14,7 +14,7 @@ constraints: zip +disable-bzip2 +disable-zstd
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/simplexmq.git
-    tag: d0588bd0ac23a459cbfc9a4789633014e91ffa19
+    tag: fa794d7878c82c370f1547f01e76f9691d229b92
 
 source-repository-package
     type: git
diff --git a/scripts/nix/sha256map.nix b/scripts/nix/sha256map.nix
index b22cef750..4539ae45c 100644
--- a/scripts/nix/sha256map.nix
+++ b/scripts/nix/sha256map.nix
@@ -1,5 +1,5 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."d0588bd0ac23a459cbfc9a4789633014e91ffa19" = "0b17qy74capb0jyli8f3pg1xi4aawhcgpmaz2ykl9g3605png1na";
+  "https://github.com/simplex-chat/simplexmq.git"."fa794d7878c82c370f1547f01e76f9691d229b92" = "0fmgq7yy42rlpf4a0agz3149iqkw5cri85xppwgicl4i9c7bs9gi";
   "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38";
   "https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d";
   "https://github.com/simplex-chat/sqlcipher-simple.git"."a46bd361a19376c5211f1058908fc0ae6bf42446" = "1z0r78d8f0812kxbgsm735qf6xx8lvaz27k1a0b4a2m0sshpd5gl";
diff --git a/tests/ChatClient.hs b/tests/ChatClient.hs
index d2165db04..759182b51 100644
--- a/tests/ChatClient.hs
+++ b/tests/ChatClient.hs
@@ -413,6 +413,7 @@ xftpServerConfig =
       logStatsStartTime = 0,
       serverStatsLogFile = "tests/tmp/xftp-server-stats.daily.log",
       serverStatsBackupFile = Nothing,
+      controlPort = Nothing,
       transportConfig = defaultTransportServerConfig
     }
 

From 2bbc687f4a391e3d5fdb3ab4f81dcc7e18771a24 Mon Sep 17 00:00:00 2001
From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Date: Sat, 6 Jan 2024 11:48:28 +0000
Subject: [PATCH 3/3] core: simplexmq 5.5.0.4

---
 cabal.project             | 2 +-
 scripts/nix/sha256map.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cabal.project b/cabal.project
index fa8f2875d..3d3002c9a 100644
--- a/cabal.project
+++ b/cabal.project
@@ -14,7 +14,7 @@ constraints: zip +disable-bzip2 +disable-zstd
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/simplexmq.git
-    tag: fa794d7878c82c370f1547f01e76f9691d229b92
+    tag: 55808b0c829fbb13876e99021cf8e6c5cce3ee78
 
 source-repository-package
     type: git
diff --git a/scripts/nix/sha256map.nix b/scripts/nix/sha256map.nix
index 4539ae45c..4d02fa422 100644
--- a/scripts/nix/sha256map.nix
+++ b/scripts/nix/sha256map.nix
@@ -1,5 +1,5 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."fa794d7878c82c370f1547f01e76f9691d229b92" = "0fmgq7yy42rlpf4a0agz3149iqkw5cri85xppwgicl4i9c7bs9gi";
+  "https://github.com/simplex-chat/simplexmq.git"."55808b0c829fbb13876e99021cf8e6c5cce3ee78" = "02zm73f57lhsmy1wn08hv0mb21al718nk27q6q01vwxg4hhhknhi";
   "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38";
   "https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d";
   "https://github.com/simplex-chat/sqlcipher-simple.git"."a46bd361a19376c5211f1058908fc0ae6bf42446" = "1z0r78d8f0812kxbgsm735qf6xx8lvaz27k1a0b4a2m0sshpd5gl";