From e37742a8f7d00af1d22d19b6908900b9b55b627b Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Mon, 14 Aug 2023 20:52:44 +0100 Subject: [PATCH] Fix #100 Eliminate dependency on cryptonite, use crypton instead --- ChangeLog.md | 1 + package.yaml | 12 +++---- pantry.cabal | 48 +++++++++++++-------------- stack-ghc-9.2.8.yaml | 12 +++++++ stack-ghc-9.4.5.yaml | 11 +++++++ stack-ghc-9.6.2.yaml | 4 +-- stack.yaml.lock | 77 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 133 insertions(+), 32 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index eae40cd8..332c2d7b 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -2,6 +2,7 @@ ## v0.9.2 +* Depend on `crypton` instead of `cryptonite`. * Depend on `tar-conduit-0.4.0`, which will tolerate long filenames and directory names in archives created by `git archive`. diff --git a/package.yaml b/package.yaml index 3e8ca282..b0e857c6 100644 --- a/package.yaml +++ b/package.yaml @@ -29,23 +29,23 @@ dependencies: - ansi-terminal - bytestring - Cabal >= 3 && < 3.11 -- casa-client +- casa-client >= 0.0.2 - casa-types - companion - conduit - conduit-extra - containers -- cryptonite -- cryptonite-conduit +- crypton +- crypton-conduit - digest - filelock - generic-deriving - hackage-security -- hpack >= 0.35.1 +- hpack >= 0.35.3 - http-client -- http-client-tls +- http-client-tls >= 0.3.6.2 - http-conduit -- http-download +- http-download >= 0.2.1.0 - http-types - memory - mtl diff --git a/pantry.cabal b/pantry.cabal index 8ac826d2..fdca9299 100644 --- a/pantry.cabal +++ b/pantry.cabal @@ -59,23 +59,23 @@ library , ansi-terminal , base >=4.10 && <5 , bytestring - , casa-client + , casa-client >=0.0.2 , casa-types , companion , conduit , conduit-extra , containers - , cryptonite - , cryptonite-conduit + , crypton + , crypton-conduit , digest , filelock , generic-deriving , hackage-security - , hpack >=0.35.1 + , hpack >=0.35.3 , http-client - , http-client-tls + , http-client-tls >=0.3.6.2 , http-conduit - , http-download + , http-download >=0.2.1.0 , http-types , internal , memory @@ -138,23 +138,23 @@ library internal , ansi-terminal , base >=4.10 && <5 , bytestring - , casa-client + , casa-client >=0.0.2 , casa-types , companion , conduit , conduit-extra , containers - , cryptonite - , cryptonite-conduit + , crypton + , crypton-conduit , digest , filelock , generic-deriving , hackage-security - , hpack >=0.35.1 + , hpack >=0.35.3 , http-client - , http-client-tls + , http-client-tls >=0.3.6.2 , http-conduit - , http-download + , http-download >=0.2.1.0 , http-types , memory , mtl @@ -202,23 +202,23 @@ executable test-pretty-exceptions , ansi-terminal , base >=4.10 && <5 , bytestring - , casa-client + , casa-client >=0.0.2 , casa-types , companion , conduit , conduit-extra , containers - , cryptonite - , cryptonite-conduit + , crypton + , crypton-conduit , digest , filelock , generic-deriving , hackage-security - , hpack >=0.35.1 + , hpack >=0.35.3 , http-client - , http-client-tls + , http-client-tls >=0.3.6.2 , http-conduit - , http-download + , http-download >=0.2.1.0 , http-types , memory , mtl @@ -299,26 +299,26 @@ test-suite spec , ansi-terminal , base >=4.10 && <5 , bytestring - , casa-client + , casa-client >=0.0.2 , casa-types , companion , conduit , conduit-extra , containers - , cryptonite - , cryptonite-conduit + , crypton + , crypton-conduit , digest , exceptions , filelock , generic-deriving , hackage-security , hedgehog - , hpack >=0.35.1 + , hpack >=0.35.3 , hspec , http-client - , http-client-tls + , http-client-tls >=0.3.6.2 , http-conduit - , http-download + , http-download >=0.2.1.0 , http-types , internal , memory diff --git a/stack-ghc-9.2.8.yaml b/stack-ghc-9.2.8.yaml index 30294b4d..e2253824 100644 --- a/stack-ghc-9.2.8.yaml +++ b/stack-ghc-9.2.8.yaml @@ -3,10 +3,22 @@ resolver: lts-20.26 # GHC 9.2.8 packages: - aeson-warning-parser-0.1.0@sha256:f2c1c42b73aa35d352060abcbb867c410cbbf57d0cb0fed607bcd1e2a74954ad,1308 +- casa-client-0.0.2@sha256:1e27a6678c511b3372c4e97ab1a4a9eca4eca8a0a090eac103a1806ce7c8584d,888 - companion-0.1.0@sha256:99f6de52c832d433639232a6d77d33abbca3b3037e49b7db6242fb9f569a8a2b,1093 +- crypton-0.33@sha256:5e92f29b9b7104d91fcdda1dec9400c9ad1f1791c231cc41ceebd783fb517dee,18202 +- crypton-conduit-0.2.3@sha256:31f44243b42f344c65be6cd2c39c07994d9186d19d15988656620d1de85aca37,1946 +- crypton-connection-0.3.1@sha256:4d0958537197956b536ea91718b1749949757022532f50b8f683290056a19021,1581 +- crypton-x509-1.7.6@sha256:c567657a705b6d6521f9dd2de999bf530d618ec00f3b939df76a41fb0fe94281,2339 +- crypton-x509-store-1.6.9@sha256:422b9b9f87a7382c66385d047615b16fc86a68c08ea22b1e0117c143a2d44050,1750 +- crypton-x509-system-1.6.7@sha256:023ed573d82983bc473a37a89e0434a085b413be9f68d07e085361056afd4637,1532 +- crypton-x509-validation-1.6.12@sha256:85989721b64be4b90de9f66ef641c26f57575cffed1a50d707065fb60176f386,2227 +- hpack-0.35.4@sha256:171eaba080e308d26f16cb1b8f77d2b6a2899cf4ff98085912be167f8136ffef,5119 +- http-client-tls-0.3.6.2@sha256:a9362782ddbc1d1f84a2919bbb1b224cefd2b24071b81c3aeb5c5c8d6a1fdb0f,2004 +- http-download-0.2.1.0@sha256:a97863e96f7d44efc3d0e3061db7fe2540b8374ca44ae90d0b56040140cb7506,1716 - rio-prettyprint-0.1.4.0@sha256:1f8eb3ead0ef33d3736d53e1de5e9b2c91a0c207cdca23321bd74c401e85f23a,1301 - static-bytes-0.1.0@sha256:35dbf30f617baa0151682c97687042516be07872a39984f9fe31f78125b962bf,1627 - tar-conduit-0.4.0@sha256:f333649770f5ec42a83a93b0d424cf6bb895d80dfbee05a54340395f81d036ae,3126 +- tls-1.7.1@sha256:3759864ce4452c31b7740ef181667dd3fdd3d136d7bdc01e0cf5200609973d5c,5566 flags: ansi-terminal: diff --git a/stack-ghc-9.4.5.yaml b/stack-ghc-9.4.5.yaml index 897a1960..26a5ef44 100644 --- a/stack-ghc-9.4.5.yaml +++ b/stack-ghc-9.4.5.yaml @@ -3,9 +3,20 @@ resolver: lts-21.6 # GHC 9.4.5 packages: - aeson-warning-parser-0.1.0@sha256:f2c1c42b73aa35d352060abcbb867c410cbbf57d0cb0fed607bcd1e2a74954ad,1308 +- casa-client-0.0.2@sha256:1e27a6678c511b3372c4e97ab1a4a9eca4eca8a0a090eac103a1806ce7c8584d,888 - companion-0.1.0@sha256:99f6de52c832d433639232a6d77d33abbca3b3037e49b7db6242fb9f569a8a2b,1093 +- crypton-conduit-0.2.3@sha256:31f44243b42f344c65be6cd2c39c07994d9186d19d15988656620d1de85aca37,1946 +- crypton-connection-0.3.1@sha256:4d0958537197956b536ea91718b1749949757022532f50b8f683290056a19021,1581 +- crypton-x509-1.7.6@sha256:c567657a705b6d6521f9dd2de999bf530d618ec00f3b939df76a41fb0fe94281,2339 +- crypton-x509-store-1.6.9@sha256:422b9b9f87a7382c66385d047615b16fc86a68c08ea22b1e0117c143a2d44050,1750 +- crypton-x509-system-1.6.7@sha256:023ed573d82983bc473a37a89e0434a085b413be9f68d07e085361056afd4637,1532 +- crypton-x509-validation-1.6.12@sha256:85989721b64be4b90de9f66ef641c26f57575cffed1a50d707065fb60176f386,2227 +- hpack-0.35.4@sha256:171eaba080e308d26f16cb1b8f77d2b6a2899cf4ff98085912be167f8136ffef,5119 +- http-client-tls-0.3.6.2@sha256:a9362782ddbc1d1f84a2919bbb1b224cefd2b24071b81c3aeb5c5c8d6a1fdb0f,2004 +- http-download-0.2.1.0@sha256:a97863e96f7d44efc3d0e3061db7fe2540b8374ca44ae90d0b56040140cb7506,1716 - static-bytes-0.1.0@sha256:35dbf30f617baa0151682c97687042516be07872a39984f9fe31f78125b962bf,1627 - tar-conduit-0.4.0@sha256:f333649770f5ec42a83a93b0d424cf6bb895d80dfbee05a54340395f81d036ae,3126 +- tls-1.7.1@sha256:3759864ce4452c31b7740ef181667dd3fdd3d136d7bdc01e0cf5200609973d5c,5566 flags: ansi-terminal: diff --git a/stack-ghc-9.6.2.yaml b/stack-ghc-9.6.2.yaml index 87f07ec0..4197e4b1 100644 --- a/stack-ghc-9.6.2.yaml +++ b/stack-ghc-9.6.2.yaml @@ -1,8 +1,8 @@ # Snapshot specification for GHC 9.6.2. -resolver: nightly-2023-08-06 # GHC 9.6.2 +resolver: nightly-2023-08-15 # GHC 9.6.2 packages: -- tar-conduit-0.4.0@sha256:f333649770f5ec42a83a93b0d424cf6bb895d80dfbee05a54340395f81d036ae,3126 +- casa-client-0.0.2@sha256:1e27a6678c511b3372c4e97ab1a4a9eca4eca8a0a090eac103a1806ce7c8584d,888 flags: hackage-security: diff --git a/stack.yaml.lock b/stack.yaml.lock index f71ace90..34e787f5 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -11,6 +11,13 @@ packages: size: 336 original: hackage: aeson-warning-parser-0.1.0@sha256:f2c1c42b73aa35d352060abcbb867c410cbbf57d0cb0fed607bcd1e2a74954ad,1308 +- completed: + hackage: casa-client-0.0.2@sha256:1e27a6678c511b3372c4e97ab1a4a9eca4eca8a0a090eac103a1806ce7c8584d,888 + pantry-tree: + sha256: c72d43eca832cc3c9a3074e86b39815de788cda6de966dfae4471194e9abd17d + size: 167 + original: + hackage: casa-client-0.0.2@sha256:1e27a6678c511b3372c4e97ab1a4a9eca4eca8a0a090eac103a1806ce7c8584d,888 - completed: hackage: companion-0.1.0@sha256:99f6de52c832d433639232a6d77d33abbca3b3037e49b7db6242fb9f569a8a2b,1093 pantry-tree: @@ -18,6 +25,69 @@ packages: size: 328 original: hackage: companion-0.1.0@sha256:99f6de52c832d433639232a6d77d33abbca3b3037e49b7db6242fb9f569a8a2b,1093 +- completed: + hackage: crypton-conduit-0.2.3@sha256:31f44243b42f344c65be6cd2c39c07994d9186d19d15988656620d1de85aca37,1946 + pantry-tree: + sha256: 06781001956f2ccfae0e6b4f33c213bd3121c6462f8534e9dca87bf51e4663e0 + size: 592 + original: + hackage: crypton-conduit-0.2.3@sha256:31f44243b42f344c65be6cd2c39c07994d9186d19d15988656620d1de85aca37,1946 +- completed: + hackage: crypton-connection-0.3.1@sha256:4d0958537197956b536ea91718b1749949757022532f50b8f683290056a19021,1581 + pantry-tree: + sha256: e35ac3a35611afab9fafac633d0c4e6328b9cce4c8262378671d6c5a739e7e70 + size: 394 + original: + hackage: crypton-connection-0.3.1@sha256:4d0958537197956b536ea91718b1749949757022532f50b8f683290056a19021,1581 +- completed: + hackage: crypton-x509-1.7.6@sha256:c567657a705b6d6521f9dd2de999bf530d618ec00f3b939df76a41fb0fe94281,2339 + pantry-tree: + sha256: 729e7db8dfc0a8b43e08bbd8d1387c9065e39beda6ac39e0fb9f10140810a3eb + size: 1080 + original: + hackage: crypton-x509-1.7.6@sha256:c567657a705b6d6521f9dd2de999bf530d618ec00f3b939df76a41fb0fe94281,2339 +- completed: + hackage: crypton-x509-store-1.6.9@sha256:422b9b9f87a7382c66385d047615b16fc86a68c08ea22b1e0117c143a2d44050,1750 + pantry-tree: + sha256: 87654d130a7f987ee139c821a1be45736d18df9fa4cb1142c4e054d3802338f3 + size: 406 + original: + hackage: crypton-x509-store-1.6.9@sha256:422b9b9f87a7382c66385d047615b16fc86a68c08ea22b1e0117c143a2d44050,1750 +- completed: + hackage: crypton-x509-system-1.6.7@sha256:023ed573d82983bc473a37a89e0434a085b413be9f68d07e085361056afd4637,1532 + pantry-tree: + sha256: c0ca49e6a9537f3fdb7b47c5cfe93f7d744a369bf9d089f3c668b9c2d97402b7 + size: 399 + original: + hackage: crypton-x509-system-1.6.7@sha256:023ed573d82983bc473a37a89e0434a085b413be9f68d07e085361056afd4637,1532 +- completed: + hackage: crypton-x509-validation-1.6.12@sha256:85989721b64be4b90de9f66ef641c26f57575cffed1a50d707065fb60176f386,2227 + pantry-tree: + sha256: d4a0135f11218614fcd912cffaf54de8f749caca8696380e2589cbcfd64cc681 + size: 639 + original: + hackage: crypton-x509-validation-1.6.12@sha256:85989721b64be4b90de9f66ef641c26f57575cffed1a50d707065fb60176f386,2227 +- completed: + hackage: hpack-0.35.4@sha256:171eaba080e308d26f16cb1b8f77d2b6a2899cf4ff98085912be167f8136ffef,5119 + pantry-tree: + sha256: aae0dffd9b40acc51e77ef043c2f1d4d579753037357ccf55c8d50a98b7fe2ef + size: 3742 + original: + hackage: hpack-0.35.4@sha256:171eaba080e308d26f16cb1b8f77d2b6a2899cf4ff98085912be167f8136ffef,5119 +- completed: + hackage: http-client-tls-0.3.6.2@sha256:a9362782ddbc1d1f84a2919bbb1b224cefd2b24071b81c3aeb5c5c8d6a1fdb0f,2004 + pantry-tree: + sha256: 600dfa374198408aa466fdb483834a51a0e15a25fb095992f82b0f4f05adb3f7 + size: 435 + original: + hackage: http-client-tls-0.3.6.2@sha256:a9362782ddbc1d1f84a2919bbb1b224cefd2b24071b81c3aeb5c5c8d6a1fdb0f,2004 +- completed: + hackage: http-download-0.2.1.0@sha256:a97863e96f7d44efc3d0e3061db7fe2540b8374ca44ae90d0b56040140cb7506,1716 + pantry-tree: + sha256: fefc789f5b1c1891488b6b45b12423055ec0ddc8027ef6b5a4b871e2934b9f29 + size: 393 + original: + hackage: http-download-0.2.1.0@sha256:a97863e96f7d44efc3d0e3061db7fe2540b8374ca44ae90d0b56040140cb7506,1716 - completed: hackage: static-bytes-0.1.0@sha256:35dbf30f617baa0151682c97687042516be07872a39984f9fe31f78125b962bf,1627 pantry-tree: @@ -32,6 +102,13 @@ packages: size: 828 original: hackage: tar-conduit-0.4.0@sha256:f333649770f5ec42a83a93b0d424cf6bb895d80dfbee05a54340395f81d036ae,3126 +- completed: + hackage: tls-1.7.1@sha256:3759864ce4452c31b7740ef181667dd3fdd3d136d7bdc01e0cf5200609973d5c,5566 + pantry-tree: + sha256: 86f1b4c5d019628ceaa1a747af080a4ab43aba25ff7b7d9812ddbdf2a7dd8c00 + size: 4897 + original: + hackage: tls-1.7.1@sha256:3759864ce4452c31b7740ef181667dd3fdd3d136d7bdc01e0cf5200609973d5c,5566 snapshots: - completed: sha256: 2e7d4a730d8eb5373b2d383fac84efcf7c81e3b7a5fce71b4c2e19a1768f25a6