Merge pull request #6209 from commercialhaskell/fix6200

Fix #6200 Eliminate dependency on `cryptonite`, use `crypton` instead

Author: mpilgrem

ChangeLog.md

@@ -26,6 +26,7 @@ Behavior changes:
 
 Other enhancements:
 
+* Bump to Hpack 0.35.4.
 * Avoid the duplicate resolving of usage files when parsing `*.hi` files into a
   set of modules and a collection of resolved usage files. See
   [#6123](https://github.com/commercialhaskell/stack/pull/6123).

package.yaml

@@ -67,12 +67,12 @@ dependencies:
 - attoparsec
 - base64-bytestring
 - bytestring
-- casa-client
+- casa-client >= 0.0.2
 - companion
 - conduit
 - conduit-extra
 - containers
-- cryptonite
+- crypton
 - directory
 - echo
 - exceptions
@@ -83,12 +83,12 @@ dependencies:
 - fsnotify >= 0.4.1
 - generic-deriving
 - hi-file-parser >= 0.1.4.0
-- hpack
+- hpack >= 0.35.3
 - hpc
 - 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
 - microlens
@@ -97,7 +97,7 @@ dependencies:
 - neat-interpolation
 - open-browser
 - optparse-applicative >= 0.18.1.0
-- pantry >= 0.8.3
+- pantry >= 0.9.2
 - path
 - path-io
 # In order for Cabal (the tool) to build Stack, it needs to be told of the

stack-ghc-9.4.5.yaml

@@ -9,11 +9,23 @@ extra-deps:
 # Required because ansi-wl-pprint-0.6.9 specifies ansi-terminal < 0.12. See:
 # https://github.com/ekmett/ansi-wl-pprint/issues/29
 - ansi-wl-pprint-1.0.2@sha256:b817853b5310b8e7847469847608b664c3e75b4b30c332f2cb8c0d00751ef9c1,1915
+- 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
 - optparse-applicative-0.18.1.0@sha256:b4cf8d9018e5e67cb1f14edb5130b6d05ad8bc1b5f6bd4efaa6ec0b7f28f559d,5132
 - optparse-generic-1.5.0@sha256:1de163cf439350d2c5817dd9067b51eeb62d6fdd4e2f0a70c06c9e1b931c38d7,2285
-- pantry-0.9.1@sha256:69058b32be71d0fbc51727ddd677eb6429657c2c1cebbd9802e6b4f8a5eda51c,7530
+- pantry-0.9.2@sha256:e1c5444d1b4003435d860853abd21e91e5fc337f2b2e2c8c992a2bac04712dc0,7650
 - static-bytes-0.1.0@sha256:35dbf30f617baa0151682c97687042516be07872a39984f9fe31f78125b962bf,1627
+- tar-conduit-0.4.0@sha256:f333649770f5ec42a83a93b0d424cf6bb895d80dfbee05a54340395f81d036ae,3126
+- tls-1.7.0@sha256:fa82e9ca8fd887b66fba8433b3ba1db4e5e047fe7c815707f06209679d04177b,5566
 
 drop-packages:
 # See https://github.com/commercialhaskell/stack/pull/4712

stack-ghc-9.4.5.yaml.lock

@@ -25,13 +25,83 @@ packages:
       size: 390
   original:
     hackage: ansi-wl-pprint-1.0.2@sha256:b817853b5310b8e7847469847608b664c3e75b4b30c332f2cb8c0d00751ef9c1,1915
+- 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:
       sha256: 7d36c8a038ab4db197c0a395c63523b47beec9f6c72a64271bb0f6b112d1ebd1
       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: optparse-applicative-0.18.1.0@sha256:b4cf8d9018e5e67cb1f14edb5130b6d05ad8bc1b5f6bd4efaa6ec0b7f28f559d,5132
     pantry-tree:
@@ -47,19 +117,33 @@ packages:
   original:
     hackage: optparse-generic-1.5.0@sha256:1de163cf439350d2c5817dd9067b51eeb62d6fdd4e2f0a70c06c9e1b931c38d7,2285
 - completed:
-    hackage: pantry-0.9.1@sha256:69058b32be71d0fbc51727ddd677eb6429657c2c1cebbd9802e6b4f8a5eda51c,7530
+    hackage: pantry-0.9.2@sha256:e1c5444d1b4003435d860853abd21e91e5fc337f2b2e2c8c992a2bac04712dc0,7650
     pantry-tree:
-      sha256: b3bbe99504efc22d7f0d776cb6ecd692df435966f0107eeb4d5ba9085f99b56a
+      sha256: 8f14d90ab352a42847bcffa6cf814e45543b8aa4a56c71b3c74eba6beec3b831
       size: 2665
   original:
-    hackage: pantry-0.9.1@sha256:69058b32be71d0fbc51727ddd677eb6429657c2c1cebbd9802e6b4f8a5eda51c,7530
+    hackage: pantry-0.9.2@sha256:e1c5444d1b4003435d860853abd21e91e5fc337f2b2e2c8c992a2bac04712dc0,7650
 - completed:
     hackage: static-bytes-0.1.0@sha256:35dbf30f617baa0151682c97687042516be07872a39984f9fe31f78125b962bf,1627
     pantry-tree:
       sha256: 38980443d7bdf00dde4c34babbb1e4b858cdc3aca8973c50f22444cfb03135a2
       size: 440
   original:
     hackage: static-bytes-0.1.0@sha256:35dbf30f617baa0151682c97687042516be07872a39984f9fe31f78125b962bf,1627
+- completed:
+    hackage: tar-conduit-0.4.0@sha256:f333649770f5ec42a83a93b0d424cf6bb895d80dfbee05a54340395f81d036ae,3126
+    pantry-tree:
+      sha256: 54de1a1b2f3f13ebeea65ea3f13a53c89e8e6e2f85bc5810c2a6eddd428cb827
+      size: 828
+  original:
+    hackage: tar-conduit-0.4.0@sha256:f333649770f5ec42a83a93b0d424cf6bb895d80dfbee05a54340395f81d036ae,3126
+- completed:
+    hackage: tls-1.7.0@sha256:fa82e9ca8fd887b66fba8433b3ba1db4e5e047fe7c815707f06209679d04177b,5566
+    pantry-tree:
+      sha256: 7521091021ecbbbf9b46c2fdb08f9e449eddcebf3a3922f76d23baca5db83b4f
+      size: 4897
+  original:
+    hackage: tls-1.7.0@sha256:fa82e9ca8fd887b66fba8433b3ba1db4e5e047fe7c815707f06209679d04177b,5566
 snapshots:
 - completed:
     sha256: 2e7d4a730d8eb5373b2d383fac84efcf7c81e3b7a5fce71b4c2e19a1768f25a6

stack-ghc-9.6.2.yaml

@@ -2,10 +2,10 @@
 # built with GHC 9.6.2.
 
 # GHC 9.6.2
-resolver: nightly-2023-08-06
+resolver: nightly-2023-08-17
 
 extra-deps:
-- pantry-0.9.1@sha256:69058b32be71d0fbc51727ddd677eb6429657c2c1cebbd9802e6b4f8a5eda51c,7530
+- pantry-0.9.2@sha256:e1c5444d1b4003435d860853abd21e91e5fc337f2b2e2c8c992a2bac04712dc0,7650
 
 drop-packages:
 # See https://github.com/commercialhaskell/stack/pull/4712

stack-ghc-9.6.2.yaml.lock

@@ -5,15 +5,15 @@
 
 packages:
 - completed:
-    hackage: pantry-0.9.1@sha256:69058b32be71d0fbc51727ddd677eb6429657c2c1cebbd9802e6b4f8a5eda51c,7530
+    hackage: pantry-0.9.2@sha256:e1c5444d1b4003435d860853abd21e91e5fc337f2b2e2c8c992a2bac04712dc0,7650
     pantry-tree:
-      sha256: b3bbe99504efc22d7f0d776cb6ecd692df435966f0107eeb4d5ba9085f99b56a
+      sha256: 8f14d90ab352a42847bcffa6cf814e45543b8aa4a56c71b3c74eba6beec3b831
       size: 2665
   original:
-    hackage: pantry-0.9.1@sha256:69058b32be71d0fbc51727ddd677eb6429657c2c1cebbd9802e6b4f8a5eda51c,7530
+    hackage: pantry-0.9.2@sha256:e1c5444d1b4003435d860853abd21e91e5fc337f2b2e2c8c992a2bac04712dc0,7650
 snapshots:
 - completed:
-    sha256: 960cd77e580438eed4dc5422ecc72404c0021bc1e0654ed25907f81956fdeff1
-    size: 657384
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/8/6.yaml
-  original: nightly-2023-08-06
+    sha256: 1c4e4c1bf8798239c9c9e512dee99550c7a6da40d90c23e6ee2fb8cc4707cfc3
+    size: 658023
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/8/17.yaml
+  original: nightly-2023-08-17

stack.cabal

@@ -340,12 +340,12 @@ library
     , base >=4.14.3.0 && <5
     , base64-bytestring
     , bytestring
-    , casa-client
+    , casa-client >=0.0.2
     , companion
     , conduit
     , conduit-extra
     , containers
-    , cryptonite
+    , crypton
     , directory
     , echo
     , exceptions
@@ -356,12 +356,12 @@ library
     , fsnotify >=0.4.1
     , generic-deriving
     , hi-file-parser >=0.1.4.0
-    , hpack
+    , hpack >=0.35.3
     , hpc
     , 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
     , microlens
@@ -370,7 +370,7 @@ library
     , neat-interpolation
     , open-browser
     , optparse-applicative >=0.18.1.0
-    , pantry >=0.8.3
+    , pantry >=0.9.2
     , path
     , path-io
     , persistent >=2.14.0.0 && <2.15
@@ -457,12 +457,12 @@ executable stack
     , base >=4.14.3.0 && <5
     , base64-bytestring
     , bytestring
-    , casa-client
+    , casa-client >=0.0.2
     , companion
     , conduit
     , conduit-extra
     , containers
-    , cryptonite
+    , crypton
     , directory
     , echo
     , exceptions
@@ -473,12 +473,12 @@ executable stack
     , fsnotify >=0.4.1
     , generic-deriving
     , hi-file-parser >=0.1.4.0
-    , hpack
+    , hpack >=0.35.3
     , hpc
     , 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
     , microlens
@@ -487,7 +487,7 @@ executable stack
     , neat-interpolation
     , open-browser
     , optparse-applicative >=0.18.1.0
-    , pantry >=0.8.3
+    , pantry >=0.9.2
     , path
     , path-io
     , persistent >=2.14.0.0 && <2.15
@@ -553,12 +553,12 @@ executable stack-integration-test
     , base >=4.14.3.0 && <5
     , base64-bytestring
     , bytestring
-    , casa-client
+    , casa-client >=0.0.2
     , companion
     , conduit
     , conduit-extra
     , containers
-    , cryptonite
+    , crypton
     , directory
     , echo
     , exceptions
@@ -569,13 +569,13 @@ executable stack-integration-test
     , fsnotify >=0.4.1
     , generic-deriving
     , hi-file-parser >=0.1.4.0
-    , hpack
+    , hpack >=0.35.3
     , hpc
     , 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
     , memory
     , microlens
@@ -585,7 +585,7 @@ executable stack-integration-test
     , open-browser
     , optparse-applicative >=0.18.1.0
     , optparse-generic
-    , pantry >=0.8.3
+    , pantry >=0.9.2
     , path
     , path-io
     , persistent >=2.14.0.0 && <2.15
@@ -665,12 +665,12 @@ test-suite stack-test
     , base >=4.14.3.0 && <5
     , base64-bytestring
     , bytestring
-    , casa-client
+    , casa-client >=0.0.2
     , companion
     , conduit
     , conduit-extra
     , containers
-    , cryptonite
+    , crypton
     , directory
     , echo
     , exceptions
@@ -681,13 +681,13 @@ test-suite stack-test
     , fsnotify >=0.4.1
     , generic-deriving
     , hi-file-parser >=0.1.4.0
-    , hpack
+    , hpack >=0.35.3
     , hpc
     , 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
     , memory
     , microlens
@@ -696,7 +696,7 @@ test-suite stack-test
     , neat-interpolation
     , open-browser
     , optparse-applicative >=0.18.1.0
-    , pantry >=0.8.3
+    , pantry >=0.9.2
     , path
     , path-io
     , persistent >=2.14.0.0 && <2.15