Skip to content

Commit bd365e7

Browse files
mpilgremmpilgrem
committed
Fix #6200 Eliminate dependency on cryptonite, use crypton instead
1 parent 59e285e commit bd365e7

9 files changed

+286
-50
lines changed

‎ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Behavior changes:
2626

2727
Other enhancements:
2828

29+
* Bump to Hpack 0.35.4.
2930
* Avoid the duplicate resolving of usage files when parsing `*.hi` files into a
3031
set of modules and a collection of resolved usage files. See
3132
[#6123](https://github.com/commercialhaskell/stack/pull/6123).

‎package.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@ dependencies:
6767
- attoparsec
6868
- base64-bytestring
6969
- bytestring
70-
- casa-client
70+
- casa-client >= 0.0.2
7171
- companion
7272
- conduit
7373
- conduit-extra
7474
- containers
75-
- cryptonite
75+
- crypton
7676
- directory
7777
- echo
7878
- exceptions
@@ -83,12 +83,12 @@ dependencies:
8383
- fsnotify >= 0.4.1
8484
- generic-deriving
8585
- hi-file-parser >= 0.1.4.0
86-
- hpack
86+
- hpack >= 0.35.3
8787
- hpc
8888
- http-client
89-
- http-client-tls
89+
- http-client-tls >= 0.3.6.2
9090
- http-conduit
91-
- http-download
91+
- http-download >= 0.2.1.0
9292
- http-types
9393
- memory
9494
- microlens
@@ -97,7 +97,7 @@ dependencies:
9797
- neat-interpolation
9898
- open-browser
9999
- optparse-applicative >= 0.18.1.0
100-
- pantry >= 0.8.3
100+
- pantry >= 0.9.2
101101
- path
102102
- path-io
103103
# In order for Cabal (the tool) to build Stack, it needs to be told of the

‎stack-ghc-9.4.5.yaml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,28 @@ extra-deps:
99
# Required because ansi-wl-pprint-0.6.9 specifies ansi-terminal < 0.12. See:
1010
# https://github.com/ekmett/ansi-wl-pprint/issues/29
1111
- ansi-wl-pprint-1.0.2@sha256:b817853b5310b8e7847469847608b664c3e75b4b30c332f2cb8c0d00751ef9c1,1915
12+
- casa-client-0.0.2@sha256:1e27a6678c511b3372c4e97ab1a4a9eca4eca8a0a090eac103a1806ce7c8584d,888
1213
- companion-0.1.0@sha256:99f6de52c832d433639232a6d77d33abbca3b3037e49b7db6242fb9f569a8a2b,1093
14+
- crypton-conduit-0.2.3@sha256:31f44243b42f344c65be6cd2c39c07994d9186d19d15988656620d1de85aca37,1946
15+
- crypton-connection-0.3.1@sha256:4d0958537197956b536ea91718b1749949757022532f50b8f683290056a19021,1581
16+
- crypton-x509-1.7.6@sha256:c567657a705b6d6521f9dd2de999bf530d618ec00f3b939df76a41fb0fe94281,2339
17+
- crypton-x509-store-1.6.9@sha256:422b9b9f87a7382c66385d047615b16fc86a68c08ea22b1e0117c143a2d44050,1750
18+
- crypton-x509-system-1.6.7@sha256:023ed573d82983bc473a37a89e0434a085b413be9f68d07e085361056afd4637,1532
19+
- crypton-x509-validation-1.6.12@sha256:85989721b64be4b90de9f66ef641c26f57575cffed1a50d707065fb60176f386,2227
20+
- hpack-0.35.4@sha256:171eaba080e308d26f16cb1b8f77d2b6a2899cf4ff98085912be167f8136ffef,5119
21+
- http-client-tls-0.3.6.2@sha256:a9362782ddbc1d1f84a2919bbb1b224cefd2b24071b81c3aeb5c5c8d6a1fdb0f,2004
22+
- http-download-0.2.1.0@sha256:a97863e96f7d44efc3d0e3061db7fe2540b8374ca44ae90d0b56040140cb7506,1716
1323
- optparse-applicative-0.18.1.0@sha256:b4cf8d9018e5e67cb1f14edb5130b6d05ad8bc1b5f6bd4efaa6ec0b7f28f559d,5132
1424
- optparse-generic-1.5.0@sha256:1de163cf439350d2c5817dd9067b51eeb62d6fdd4e2f0a70c06c9e1b931c38d7,2285
15-
- pantry-0.9.1@sha256:69058b32be71d0fbc51727ddd677eb6429657c2c1cebbd9802e6b4f8a5eda51c,7530
25+
26+
# - pantry-0.9.1@sha256:69058b32be71d0fbc51727ddd677eb6429657c2c1cebbd9802e6b4f8a5eda51c,7530
27+
- github: commercialhaskell/pantry
28+
# Pull request #103
29+
commit: e3c87ecacc86eb1a9841bf5658306883af943f9b
30+
1631
- static-bytes-0.1.0@sha256:35dbf30f617baa0151682c97687042516be07872a39984f9fe31f78125b962bf,1627
32+
- tar-conduit-0.4.0@sha256:f333649770f5ec42a83a93b0d424cf6bb895d80dfbee05a54340395f81d036ae,3126
33+
- tls-1.7.0@sha256:fa82e9ca8fd887b66fba8433b3ba1db4e5e047fe7c815707f06209679d04177b,5566
1734

1835
drop-packages:
1936
# See https://github.com/commercialhaskell/stack/pull/4712

‎stack-ghc-9.4.5.yaml.lock

Lines changed: 92 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,83 @@ packages:
2525
size: 390
2626
original:
2727
hackage: ansi-wl-pprint-1.0.2@sha256:b817853b5310b8e7847469847608b664c3e75b4b30c332f2cb8c0d00751ef9c1,1915
28+
- completed:
29+
hackage: casa-client-0.0.2@sha256:1e27a6678c511b3372c4e97ab1a4a9eca4eca8a0a090eac103a1806ce7c8584d,888
30+
pantry-tree:
31+
sha256: c72d43eca832cc3c9a3074e86b39815de788cda6de966dfae4471194e9abd17d
32+
size: 167
33+
original:
34+
hackage: casa-client-0.0.2@sha256:1e27a6678c511b3372c4e97ab1a4a9eca4eca8a0a090eac103a1806ce7c8584d,888
2835
- completed:
2936
hackage: companion-0.1.0@sha256:99f6de52c832d433639232a6d77d33abbca3b3037e49b7db6242fb9f569a8a2b,1093
3037
pantry-tree:
3138
sha256: 7d36c8a038ab4db197c0a395c63523b47beec9f6c72a64271bb0f6b112d1ebd1
3239
size: 328
3340
original:
3441
hackage: companion-0.1.0@sha256:99f6de52c832d433639232a6d77d33abbca3b3037e49b7db6242fb9f569a8a2b,1093
42+
- completed:
43+
hackage: crypton-conduit-0.2.3@sha256:31f44243b42f344c65be6cd2c39c07994d9186d19d15988656620d1de85aca37,1946
44+
pantry-tree:
45+
sha256: 06781001956f2ccfae0e6b4f33c213bd3121c6462f8534e9dca87bf51e4663e0
46+
size: 592
47+
original:
48+
hackage: crypton-conduit-0.2.3@sha256:31f44243b42f344c65be6cd2c39c07994d9186d19d15988656620d1de85aca37,1946
49+
- completed:
50+
hackage: crypton-connection-0.3.1@sha256:4d0958537197956b536ea91718b1749949757022532f50b8f683290056a19021,1581
51+
pantry-tree:
52+
sha256: e35ac3a35611afab9fafac633d0c4e6328b9cce4c8262378671d6c5a739e7e70
53+
size: 394
54+
original:
55+
hackage: crypton-connection-0.3.1@sha256:4d0958537197956b536ea91718b1749949757022532f50b8f683290056a19021,1581
56+
- completed:
57+
hackage: crypton-x509-1.7.6@sha256:c567657a705b6d6521f9dd2de999bf530d618ec00f3b939df76a41fb0fe94281,2339
58+
pantry-tree:
59+
sha256: 729e7db8dfc0a8b43e08bbd8d1387c9065e39beda6ac39e0fb9f10140810a3eb
60+
size: 1080
61+
original:
62+
hackage: crypton-x509-1.7.6@sha256:c567657a705b6d6521f9dd2de999bf530d618ec00f3b939df76a41fb0fe94281,2339
63+
- completed:
64+
hackage: crypton-x509-store-1.6.9@sha256:422b9b9f87a7382c66385d047615b16fc86a68c08ea22b1e0117c143a2d44050,1750
65+
pantry-tree:
66+
sha256: 87654d130a7f987ee139c821a1be45736d18df9fa4cb1142c4e054d3802338f3
67+
size: 406
68+
original:
69+
hackage: crypton-x509-store-1.6.9@sha256:422b9b9f87a7382c66385d047615b16fc86a68c08ea22b1e0117c143a2d44050,1750
70+
- completed:
71+
hackage: crypton-x509-system-1.6.7@sha256:023ed573d82983bc473a37a89e0434a085b413be9f68d07e085361056afd4637,1532
72+
pantry-tree:
73+
sha256: c0ca49e6a9537f3fdb7b47c5cfe93f7d744a369bf9d089f3c668b9c2d97402b7
74+
size: 399
75+
original:
76+
hackage: crypton-x509-system-1.6.7@sha256:023ed573d82983bc473a37a89e0434a085b413be9f68d07e085361056afd4637,1532
77+
- completed:
78+
hackage: crypton-x509-validation-1.6.12@sha256:85989721b64be4b90de9f66ef641c26f57575cffed1a50d707065fb60176f386,2227
79+
pantry-tree:
80+
sha256: d4a0135f11218614fcd912cffaf54de8f749caca8696380e2589cbcfd64cc681
81+
size: 639
82+
original:
83+
hackage: crypton-x509-validation-1.6.12@sha256:85989721b64be4b90de9f66ef641c26f57575cffed1a50d707065fb60176f386,2227
84+
- completed:
85+
hackage: hpack-0.35.4@sha256:171eaba080e308d26f16cb1b8f77d2b6a2899cf4ff98085912be167f8136ffef,5119
86+
pantry-tree:
87+
sha256: aae0dffd9b40acc51e77ef043c2f1d4d579753037357ccf55c8d50a98b7fe2ef
88+
size: 3742
89+
original:
90+
hackage: hpack-0.35.4@sha256:171eaba080e308d26f16cb1b8f77d2b6a2899cf4ff98085912be167f8136ffef,5119
91+
- completed:
92+
hackage: http-client-tls-0.3.6.2@sha256:a9362782ddbc1d1f84a2919bbb1b224cefd2b24071b81c3aeb5c5c8d6a1fdb0f,2004
93+
pantry-tree:
94+
sha256: 600dfa374198408aa466fdb483834a51a0e15a25fb095992f82b0f4f05adb3f7
95+
size: 435
96+
original:
97+
hackage: http-client-tls-0.3.6.2@sha256:a9362782ddbc1d1f84a2919bbb1b224cefd2b24071b81c3aeb5c5c8d6a1fdb0f,2004
98+
- completed:
99+
hackage: http-download-0.2.1.0@sha256:a97863e96f7d44efc3d0e3061db7fe2540b8374ca44ae90d0b56040140cb7506,1716
100+
pantry-tree:
101+
sha256: fefc789f5b1c1891488b6b45b12423055ec0ddc8027ef6b5a4b871e2934b9f29
102+
size: 393
103+
original:
104+
hackage: http-download-0.2.1.0@sha256:a97863e96f7d44efc3d0e3061db7fe2540b8374ca44ae90d0b56040140cb7506,1716
35105
- completed:
36106
hackage: optparse-applicative-0.18.1.0@sha256:b4cf8d9018e5e67cb1f14edb5130b6d05ad8bc1b5f6bd4efaa6ec0b7f28f559d,5132
37107
pantry-tree:
@@ -47,19 +117,37 @@ packages:
47117
original:
48118
hackage: optparse-generic-1.5.0@sha256:1de163cf439350d2c5817dd9067b51eeb62d6fdd4e2f0a70c06c9e1b931c38d7,2285
49119
- completed:
50-
hackage: pantry-0.9.1@sha256:69058b32be71d0fbc51727ddd677eb6429657c2c1cebbd9802e6b4f8a5eda51c,7530
120+
name: pantry
51121
pantry-tree:
52-
sha256: b3bbe99504efc22d7f0d776cb6ecd692df435966f0107eeb4d5ba9085f99b56a
53-
size: 2665
122+
sha256: 5eb6a97bc4a42ea48dd7571787676635ab4948607cca4eea5bd2bd12b2a7f618
123+
size: 3227
124+
sha256: 6792541a644b9254a76a6fc6db955a04fef09c59229671494a6fb2369ab8a41e
125+
size: 104282
126+
url: https://github.com/commercialhaskell/pantry/archive/e3c87ecacc86eb1a9841bf5658306883af943f9b.tar.gz
127+
version: 0.9.2
54128
original:
55-
hackage: pantry-0.9.1@sha256:69058b32be71d0fbc51727ddd677eb6429657c2c1cebbd9802e6b4f8a5eda51c,7530
129+
url: https://github.com/commercialhaskell/pantry/archive/e3c87ecacc86eb1a9841bf5658306883af943f9b.tar.gz
56130
- completed:
57131
hackage: static-bytes-0.1.0@sha256:35dbf30f617baa0151682c97687042516be07872a39984f9fe31f78125b962bf,1627
58132
pantry-tree:
59133
sha256: 38980443d7bdf00dde4c34babbb1e4b858cdc3aca8973c50f22444cfb03135a2
60134
size: 440
61135
original:
62136
hackage: static-bytes-0.1.0@sha256:35dbf30f617baa0151682c97687042516be07872a39984f9fe31f78125b962bf,1627
137+
- completed:
138+
hackage: tar-conduit-0.4.0@sha256:f333649770f5ec42a83a93b0d424cf6bb895d80dfbee05a54340395f81d036ae,3126
139+
pantry-tree:
140+
sha256: 54de1a1b2f3f13ebeea65ea3f13a53c89e8e6e2f85bc5810c2a6eddd428cb827
141+
size: 828
142+
original:
143+
hackage: tar-conduit-0.4.0@sha256:f333649770f5ec42a83a93b0d424cf6bb895d80dfbee05a54340395f81d036ae,3126
144+
- completed:
145+
hackage: tls-1.7.0@sha256:fa82e9ca8fd887b66fba8433b3ba1db4e5e047fe7c815707f06209679d04177b,5566
146+
pantry-tree:
147+
sha256: 7521091021ecbbbf9b46c2fdb08f9e449eddcebf3a3922f76d23baca5db83b4f
148+
size: 4897
149+
original:
150+
hackage: tls-1.7.0@sha256:fa82e9ca8fd887b66fba8433b3ba1db4e5e047fe7c815707f06209679d04177b,5566
63151
snapshots:
64152
- completed:
65153
sha256: 2e7d4a730d8eb5373b2d383fac84efcf7c81e3b7a5fce71b4c2e19a1768f25a6

‎stack-ghc-9.6.2.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,15 @@
22
# built with GHC 9.6.2.
33

44
# GHC 9.6.2
5-
resolver: nightly-2023-08-06
5+
resolver: nightly-2023-08-15
66

77
extra-deps:
8-
- pantry-0.9.1@sha256:69058b32be71d0fbc51727ddd677eb6429657c2c1cebbd9802e6b4f8a5eda51c,7530
8+
- casa-client-0.0.2@sha256:1e27a6678c511b3372c4e97ab1a4a9eca4eca8a0a090eac103a1806ce7c8584d,888
9+
10+
# - pantry-0.9.1@sha256:69058b32be71d0fbc51727ddd677eb6429657c2c1cebbd9802e6b4f8a5eda51c,7530
11+
- github: commercialhaskell/pantry
12+
# Pull request #103
13+
commit: e3c87ecacc86eb1a9841bf5658306883af943f9b
914

1015
drop-packages:
1116
# See https://github.com/commercialhaskell/stack/pull/4712

‎stack-ghc-9.6.2.yaml.lock

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,26 @@
55

66
packages:
77
- completed:
8-
hackage: pantry-0.9.1@sha256:69058b32be71d0fbc51727ddd677eb6429657c2c1cebbd9802e6b4f8a5eda51c,7530
8+
hackage: casa-client-0.0.2@sha256:1e27a6678c511b3372c4e97ab1a4a9eca4eca8a0a090eac103a1806ce7c8584d,888
99
pantry-tree:
10-
sha256: b3bbe99504efc22d7f0d776cb6ecd692df435966f0107eeb4d5ba9085f99b56a
11-
size: 2665
10+
sha256: c72d43eca832cc3c9a3074e86b39815de788cda6de966dfae4471194e9abd17d
11+
size: 167
1212
original:
13-
hackage: pantry-0.9.1@sha256:69058b32be71d0fbc51727ddd677eb6429657c2c1cebbd9802e6b4f8a5eda51c,7530
13+
hackage: casa-client-0.0.2@sha256:1e27a6678c511b3372c4e97ab1a4a9eca4eca8a0a090eac103a1806ce7c8584d,888
14+
- completed:
15+
name: pantry
16+
pantry-tree:
17+
sha256: 5eb6a97bc4a42ea48dd7571787676635ab4948607cca4eea5bd2bd12b2a7f618
18+
size: 3227
19+
sha256: 6792541a644b9254a76a6fc6db955a04fef09c59229671494a6fb2369ab8a41e
20+
size: 104282
21+
url: https://github.com/commercialhaskell/pantry/archive/e3c87ecacc86eb1a9841bf5658306883af943f9b.tar.gz
22+
version: 0.9.2
23+
original:
24+
url: https://github.com/commercialhaskell/pantry/archive/e3c87ecacc86eb1a9841bf5658306883af943f9b.tar.gz
1425
snapshots:
1526
- completed:
16-
sha256: 960cd77e580438eed4dc5422ecc72404c0021bc1e0654ed25907f81956fdeff1
17-
size: 657384
18-
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/8/6.yaml
19-
original: nightly-2023-08-06
27+
sha256: feae95ae036f5d1ada855337f5f0b02d4711647052bb38da5fe9c77f684e1fd9
28+
size: 658023
29+
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/8/15.yaml
30+
original: nightly-2023-08-15

0 commit comments

Comments
 (0)