android-apps-mirrors/SimpleX-Chat
0
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2025-06-28 20:29:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: 6.2.0.0 (simplexmq: 6.2.0.3)

Browse source
This commit is contained in:
Evgeny Poberezkin 2024-11-17 10:25:03 +00:00
parent e45a96935c
commit 6843269cff
No known key found for this signature in database
GPG key ID: 494BDDD9A28B577D
6 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cabal.project
View file

@ -12,7 +12,7 @@ constraints: zip +disable-bzip2 +disable-zstd
source-repository-package source-repository-package
type: git type: git
location: https://github.com/simplex-chat/simplexmq.git location: https://github.com/simplex-chat/simplexmq.git
tag: ffecf200d4874dfa34f6d15b269964c0115a54ca tag: a64c1aa2c41938c5e18cc49d08075f14e5d25f0d
source-repository-package source-repository-package
type: git type: git

2
package.yaml
View file

@ -1,5 +1,5 @@
name: simplex-chat name: simplex-chat
version: 6.1.1.0 version: 6.2.0.0
#synopsis: #synopsis:
#description: #description:
homepage: https://github.com/simplex-chat/simplex-chat#readme homepage: https://github.com/simplex-chat/simplex-chat#readme

2
scripts/nix/sha256map.nix
View file

@ -1,5 +1,5 @@
{ {
"https://github.com/simplex-chat/simplexmq.git"."ffecf200d4874dfa34f6d15b269964c0115a54ca" = "0kb8hq37fc5g198wq7dswnlwjzk67q8rrzil2dii5lc6xfr47jbs"; "https://github.com/simplex-chat/simplexmq.git"."a64c1aa2c41938c5e18cc49d08075f14e5d25f0d" = "1kf86vrh5zfrqyczfjcj3d2nagmqb0rwhhdc10fw5n8jcgmdw6rp";
"https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38"; "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/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d";
"https://github.com/simplex-chat/sqlcipher-simple.git"."a46bd361a19376c5211f1058908fc0ae6bf42446" = "1z0r78d8f0812kxbgsm735qf6xx8lvaz27k1a0b4a2m0sshpd5gl"; "https://github.com/simplex-chat/sqlcipher-simple.git"."a46bd361a19376c5211f1058908fc0ae6bf42446" = "1z0r78d8f0812kxbgsm735qf6xx8lvaz27k1a0b4a2m0sshpd5gl";

2
simplex-chat.cabal
View file

@ -5,7 +5,7 @@ cabal-version: 1.12
-- see: https://github.com/sol/hpack -- see: https://github.com/sol/hpack
name: simplex-chat name: simplex-chat
version: 6.1.1.0 version: 6.2.0.0
category: Web, System, Services, Cryptography category: Web, System, Services, Cryptography
homepage: https://github.com/simplex-chat/simplex-chat#readme homepage: https://github.com/simplex-chat/simplex-chat#readme
author: simplex.chat author: simplex.chat

4
src/Simplex/Chat/Remote.hs
View file

@ -73,11 +73,11 @@ import UnliftIO.Directory (copyFile, createDirectoryIfMissing, doesDirectoryExis
-- when acting as host -- when acting as host
minRemoteCtrlVersion :: AppVersion minRemoteCtrlVersion :: AppVersion
minRemoteCtrlVersion = AppVersion [6, 1, 0, 8] minRemoteCtrlVersion = AppVersion [6, 2, 0, 0]
-- when acting as controller -- when acting as controller
minRemoteHostVersion :: AppVersion minRemoteHostVersion :: AppVersion
minRemoteHostVersion = AppVersion [6, 1, 0, 8] minRemoteHostVersion = AppVersion [6, 2, 0, 0]
currentAppVersion :: AppVersion currentAppVersion :: AppVersion
currentAppVersion = AppVersion SC.version currentAppVersion = AppVersion SC.version

4
tests/ChatClient.hs
View file

@ -439,6 +439,8 @@ smpServerCfg =
controlPortUserAuth = Nothing, controlPortUserAuth = Nothing,
controlPortAdminAuth = Nothing, controlPortAdminAuth = Nothing,
messageExpiration = Just defaultMessageExpiration, messageExpiration = Just defaultMessageExpiration,
expireMessagesOnStart = False,
idleQueueInterval = defaultIdleQueueInterval,
notificationExpiration = defaultNtfExpiration, notificationExpiration = defaultNtfExpiration,
inactiveClientExpiration = Just defaultInactiveClientExpiration, inactiveClientExpiration = Just defaultInactiveClientExpiration,
smpCredentials = smpCredentials =
@ -524,7 +526,7 @@ serverBracket server f = do
started <- newEmptyTMVarIO started <- newEmptyTMVarIO
bracket bracket
(forkIOWithUnmask ($ server started)) (forkIOWithUnmask ($ server started))
(\t -> killThread t >> waitFor started "stop") (\t -> killThread t >> waitFor started "stop" >> threadDelay 100000)
(\_ -> waitFor started "start" >> f) (\_ -> waitFor started "start" >> f)
where where
waitFor started s = waitFor started s =