diff --git a/cabal.project b/cabal.project index ae24afd374..8a6a05a5f3 100644 --- a/cabal.project +++ b/cabal.project @@ -12,7 +12,7 @@ constraints: zip +disable-bzip2 +disable-zstd source-repository-package type: git location: https://github.com/simplex-chat/simplexmq.git - tag: 79e9447b73cc315ce35042b0a5f210c07ea39b07 + tag: 8647c24a9555d4232b1cb21fed3a7c2518aa7b13 source-repository-package type: git diff --git a/scripts/nix/sha256map.nix b/scripts/nix/sha256map.nix index d0411c584d..b9a41f0b8b 100644 --- a/scripts/nix/sha256map.nix +++ b/scripts/nix/sha256map.nix @@ -1,5 +1,5 @@ { - "https://github.com/simplex-chat/simplexmq.git"."79e9447b73cc315ce35042b0a5f210c07ea39b07" = "16z7z5a3f7gw0h188manykp008d1bqpydlrj7h497mgyjmp4cy9m"; + "https://github.com/simplex-chat/simplexmq.git"."8647c24a9555d4232b1cb21fed3a7c2518aa7b13" = "1pmblkvmj5n6qa8ri8axd9sw7fbpmq7fipaf1klbhb9ghb89lqmf"; "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/src/Simplex/Chat.hs b/src/Simplex/Chat.hs index d5ad68079f..9d2d41ef03 100644 --- a/src/Simplex/Chat.hs +++ b/src/Simplex/Chat.hs @@ -543,13 +543,13 @@ startChatController mainApp enableSndFiles = do then Just <$> async (subscribeUsers False users) else pure Nothing atomically . writeTVar s $ Just (a1, a2) - if mainApp - then do - startXFTP xftpStartWorkers - void $ forkIO $ startFilesToReceive users - startCleanupManager - void $ forkIO $ startExpireCIs users - else when enableSndFiles $ startXFTP xftpStartSndWorkers + -- if mainApp + -- then do + -- startXFTP xftpStartWorkers + -- void $ forkIO $ startFilesToReceive users + -- startCleanupManager + -- void $ forkIO $ startExpireCIs users + -- else when enableSndFiles $ startXFTP xftpStartSndWorkers pure a1 startXFTP startWorkers = do tmp <- readTVarIO =<< asks tempDirectory