core: use crypton instead of cryptonite (#3542)

* update hackage

* use crypton instead of cryptonite

* remove http2 from cabal.project

* simplexmq
This commit is contained in:
Evgeny Poberezkin 2023-12-13 11:20:03 +00:00 committed by GitHub
parent 7ec39d1ffa
commit ae94bb6f87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 26 additions and 29 deletions

View file

@ -4,25 +4,23 @@ packages: .
with-compiler: ghc-9.6.3
index-state: 2023-10-20T00:00:00Z
index-state: 2023-12-12T00:00:00Z
package cryptostore
flags: +use_crypton
constraints: zip +disable-bzip2 +disable-zstd
source-repository-package
type: git
location: https://github.com/simplex-chat/simplexmq.git
tag: f576260594b9898e26dbac1bcb4b5061fa4fa242
tag: 18be2709f59a4cb20fe9758b899622092dba062e
source-repository-package
type: git
location: https://github.com/simplex-chat/hs-socks.git
tag: a30cc7a79a08d8108316094f8f2f82a0c5e1ac51
source-repository-package
type: git
location: https://github.com/kazu-yamamoto/http2.git
tag: f5525b755ff2418e6e6ecc69e877363b0d0bcaeb
source-repository-package
type: git
location: https://github.com/simplex-chat/direct-sqlcipher.git

6
flake.lock generated
View file

@ -190,11 +190,11 @@
"hackage": {
"flake": false,
"locked": {
"lastModified": 1699834964,
"narHash": "sha256-733KT+G0c1euCeb60/u1qbX22Kvu9lNnIDfAmk6Jxq0=",
"lastModified": 1702340598,
"narHash": "sha256-CC0HI+6iKPtH+8r/ZfcpW5v/OYvL7zMwpr0xfkXV1zU=",
"owner": "input-output-hk",
"repo": "hackage.nix",
"rev": "2e891e530400187ea1083ffef15adf259061be41",
"rev": "24617c569995e38bf3b83b48eec6628a50fdb4fb",
"type": "github"
},
"original": {

View file

@ -31,7 +31,7 @@
let pkgs = haskellNix.legacyPackages.${system}.appendOverlays [android26]; in
let drv' = { extra-modules, pkgs', ... }: pkgs'.haskell-nix.project {
compiler-nix-name = "ghc963";
index-state = "2023-10-20T00:00:00Z";
index-state = "2023-12-12T00:00:00Z";
# We need this, to specify we want the cabal project.
# If the stack.yaml was dropped, this would not be necessary.
projectFileName = "cabal.project";

View file

@ -22,7 +22,7 @@ dependencies:
- composition == 1.0.*
- constraints >= 0.12 && < 0.14
- containers == 0.6.*
- cryptonite == 0.30.*
- crypton == 0.34.*
- data-default >= 0.7 && < 0.8
- directory == 1.3.*
- direct-sqlcipher == 2.3.*
@ -46,7 +46,7 @@ dependencies:
- stm == 2.5.*
- terminal == 0.2.*
- time == 1.9.*
- tls >= 1.6.0 && < 1.7
- tls >= 1.7.0 && < 1.8
- unliftio == 0.2.*
- unliftio-core == 0.2.*
- zip == 2.0.*

View file

@ -1,7 +1,6 @@
{
"https://github.com/simplex-chat/simplexmq.git"."f576260594b9898e26dbac1bcb4b5061fa4fa242" = "0lmfncha6dxxg5ck9f4a155kyd6267k5m9w5mli121lir6ikvk7z";
"https://github.com/simplex-chat/simplexmq.git"."18be2709f59a4cb20fe9758b899622092dba062e" = "08dr4vyg1wz2z768iikg8fks5zqf4dw5myr87hbpv964idda3pmj";
"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";
"https://github.com/simplex-chat/sqlcipher-simple.git"."a46bd361a19376c5211f1058908fc0ae6bf42446" = "1z0r78d8f0812kxbgsm735qf6xx8lvaz27k1a0b4a2m0sshpd5gl";
"https://github.com/simplex-chat/aeson.git"."aab7b5a14d6c5ea64c64dcaee418de1bb00dcc2b" = "0jz7kda8gai893vyvj96fy962ncv8dcsx71fbddyy8zrvc88jfrr";

View file

@ -175,7 +175,7 @@ library
, composition ==1.0.*
, constraints >=0.12 && <0.14
, containers ==0.6.*
, cryptonite ==0.30.*
, crypton ==0.34.*
, data-default ==0.7.*
, direct-sqlcipher ==2.3.*
, directory ==1.3.*
@ -199,7 +199,7 @@ library
, stm ==2.5.*
, terminal ==0.2.*
, time ==1.9.*
, tls >=1.6.0 && <1.7
, tls >=1.7.0 && <1.8
, unliftio ==0.2.*
, unliftio-core ==0.2.*
, zip ==2.0.*
@ -234,7 +234,7 @@ executable simplex-bot
, composition ==1.0.*
, constraints >=0.12 && <0.14
, containers ==0.6.*
, cryptonite ==0.30.*
, crypton ==0.34.*
, data-default ==0.7.*
, direct-sqlcipher ==2.3.*
, directory ==1.3.*
@ -259,7 +259,7 @@ executable simplex-bot
, stm ==2.5.*
, terminal ==0.2.*
, time ==1.9.*
, tls >=1.6.0 && <1.7
, tls >=1.7.0 && <1.8
, unliftio ==0.2.*
, unliftio-core ==0.2.*
, zip ==2.0.*
@ -294,7 +294,7 @@ executable simplex-bot-advanced
, composition ==1.0.*
, constraints >=0.12 && <0.14
, containers ==0.6.*
, cryptonite ==0.30.*
, crypton ==0.34.*
, data-default ==0.7.*
, direct-sqlcipher ==2.3.*
, directory ==1.3.*
@ -319,7 +319,7 @@ executable simplex-bot-advanced
, stm ==2.5.*
, terminal ==0.2.*
, time ==1.9.*
, tls >=1.6.0 && <1.7
, tls >=1.7.0 && <1.8
, unliftio ==0.2.*
, unliftio-core ==0.2.*
, zip ==2.0.*
@ -356,7 +356,7 @@ executable simplex-broadcast-bot
, composition ==1.0.*
, constraints >=0.12 && <0.14
, containers ==0.6.*
, cryptonite ==0.30.*
, crypton ==0.34.*
, data-default ==0.7.*
, direct-sqlcipher ==2.3.*
, directory ==1.3.*
@ -381,7 +381,7 @@ executable simplex-broadcast-bot
, stm ==2.5.*
, terminal ==0.2.*
, time ==1.9.*
, tls >=1.6.0 && <1.7
, tls >=1.7.0 && <1.8
, unliftio ==0.2.*
, unliftio-core ==0.2.*
, zip ==2.0.*
@ -417,7 +417,7 @@ executable simplex-chat
, composition ==1.0.*
, constraints >=0.12 && <0.14
, containers ==0.6.*
, cryptonite ==0.30.*
, crypton ==0.34.*
, data-default ==0.7.*
, direct-sqlcipher ==2.3.*
, directory ==1.3.*
@ -442,7 +442,7 @@ executable simplex-chat
, stm ==2.5.*
, terminal ==0.2.*
, time ==1.9.*
, tls >=1.6.0 && <1.7
, tls >=1.7.0 && <1.8
, unliftio ==0.2.*
, unliftio-core ==0.2.*
, websockets ==0.12.*
@ -482,7 +482,7 @@ executable simplex-directory-service
, composition ==1.0.*
, constraints >=0.12 && <0.14
, containers ==0.6.*
, cryptonite ==0.30.*
, crypton ==0.34.*
, data-default ==0.7.*
, direct-sqlcipher ==2.3.*
, directory ==1.3.*
@ -507,7 +507,7 @@ executable simplex-directory-service
, stm ==2.5.*
, terminal ==0.2.*
, time ==1.9.*
, tls >=1.6.0 && <1.7
, tls >=1.7.0 && <1.8
, unliftio ==0.2.*
, unliftio-core ==0.2.*
, zip ==2.0.*
@ -571,7 +571,7 @@ test-suite simplex-chat-test
, composition ==1.0.*
, constraints >=0.12 && <0.14
, containers ==0.6.*
, cryptonite ==0.30.*
, crypton ==0.34.*
, data-default ==0.7.*
, deepseq ==1.4.*
, direct-sqlcipher ==2.3.*
@ -600,7 +600,7 @@ test-suite simplex-chat-test
, stm ==2.5.*
, terminal ==0.2.*
, time ==1.9.*
, tls >=1.6.0 && <1.7
, tls >=1.7.0 && <1.8
, unliftio ==0.2.*
, unliftio-core ==0.2.*
, zip ==2.0.*