diff --git a/cabal.project b/cabal.project index 88f8b9aede..e28354f59a 100644 --- a/cabal.project +++ b/cabal.project @@ -2,7 +2,7 @@ packages: . -- packages: . ../simplexmq -- packages: . ../simplexmq ../direct-sqlcipher ../sqlcipher-simple -index-state: 2023-12-12T00:00:00Z +index-state: 2025-07-01T00:00:00Z package cryptostore flags: +use_crypton @@ -12,7 +12,7 @@ constraints: zip +disable-bzip2 +disable-zstd source-repository-package type: git location: https://github.com/simplex-chat/simplexmq.git - tag: 0319addd2b6bcd1206921c844f81fea4adc791a4 + tag: 55be4fa7bd902586281e4c717e4e1a21dc9dc912 source-repository-package type: git @@ -49,17 +49,3 @@ source-repository-package type: git location: https://github.com/simplex-chat/zip.git tag: bd421c6b19cc4c465cd7af1f6f26169fb8ee1ebc - --- waiting for published warp-tls-3.4.7 -source-repository-package - type: git - location: https://github.com/yesodweb/wai.git - tag: ec5e017d896a78e787a5acea62b37a4e677dec2e - subdir: warp-tls - --- backported fork due http-5.0 -source-repository-package - type: git - location: https://github.com/simplex-chat/wai.git - tag: 2f6e5aa5f05ba9140ac99e195ee647b4f7d926b0 - subdir: warp diff --git a/scripts/nix/sha256map.nix b/scripts/nix/sha256map.nix index c424aeb9fc..f4921c5a8f 100644 --- a/scripts/nix/sha256map.nix +++ b/scripts/nix/sha256map.nix @@ -1,5 +1,5 @@ { - "https://github.com/simplex-chat/simplexmq.git"."0319addd2b6bcd1206921c844f81fea4adc791a4" = "1rm0m6bch648xpa8l28m3ww6fi686g9ky68qc46gsqirpm29kh0q"; + "https://github.com/simplex-chat/simplexmq.git"."55be4fa7bd902586281e4c717e4e1a21dc9dc912" = "0bpkiplx2iczn0cgsniypj42j1ac4q5b4xq3pl0d4dzq8xl39vxj"; "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"; @@ -7,6 +7,4 @@ "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"; - "https://github.com/yesodweb/wai.git"."ec5e017d896a78e787a5acea62b37a4e677dec2e" = "1ckcpmpjfy9jiqrb52q20lj7ln4hmq9v2jk6kpkf3m68c1m9c2bx"; - "https://github.com/simplex-chat/wai.git"."2f6e5aa5f05ba9140ac99e195ee647b4f7d926b0" = "199g4rjdf1zp1fcw8nqdsyr1h36hmg424qqx03071jk7j00z7ay4"; } diff --git a/simplex-chat.cabal b/simplex-chat.cabal index 8029915ace..ef5786eb7b 100644 --- a/simplex-chat.cabal +++ b/simplex-chat.cabal @@ -295,7 +295,7 @@ library , stm ==2.5.* , terminal ==0.2.* , time ==1.12.* - , tls >=1.9.0 && <1.10 + , tls ==2.1.6.* , unliftio ==0.2.* , unliftio-core ==0.2.* , uri-bytestring >=0.3.3.1 && <0.4