Skip to content

Commit 5eec842

Browse files
committed
Fix #5536 Depend on pantry-0.9.3.2
1 parent 93a7bd8 commit 5eec842

File tree

7 files changed

+31
-11
lines changed

7 files changed

+31
-11
lines changed

ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ Other enhancements:
1818
Bug fixes:
1919

2020
* `--haddock-for-hackage` does not ignore `--haddock-arguments`.
21+
* On Windows, package locations that are Git repositories with submodules now
22+
work as intended.
2123

2224
## v2.15.1 - 2024-02-09
2325

package.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ dependencies:
9898
- neat-interpolation
9999
- open-browser
100100
- optparse-applicative >= 0.18.1.0
101-
- pantry >= 0.9.3.1
101+
- pantry >= 0.9.3.2
102102
- path >= 0.9.5
103103
- path-io
104104
# In order for Cabal (the tool) to build Stack, it needs to be told of the

stack-ghc-9.8.1.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
# built with GHC 9.8.1.
33

44
# GHC 9.8.1
5-
snapshot: nightly-2024-01-26
5+
snapshot: nightly-2024-02-24
6+
7+
extra-deps:
8+
- pantry-0.9.3.2@sha256:336373d8cbb10505ff16ac6e35cb9d8a7f45293a908de1c00f55c133ee7dde86,7511
69

710
docker:
811
enable: false

stack-ghc-9.8.1.yaml.lock

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,17 @@
33
# For more information, please see the documentation at:
44
# https://docs.haskellstack.org/en/stable/lock_files
55

6-
packages: []
6+
packages:
7+
- completed:
8+
hackage: pantry-0.9.3.2@sha256:336373d8cbb10505ff16ac6e35cb9d8a7f45293a908de1c00f55c133ee7dde86,7511
9+
pantry-tree:
10+
sha256: 820f4442ca96663fa57405f22385d216fbc1a28b9f49c7c82ad2a391803abe51
11+
size: 2722
12+
original:
13+
hackage: pantry-0.9.3.2@sha256:336373d8cbb10505ff16ac6e35cb9d8a7f45293a908de1c00f55c133ee7dde86,7511
714
snapshots:
815
- completed:
9-
sha256: 876a5c75d90718add42e1ad36d66000bf35050ce1c66748119897a32df613186
10-
size: 563963
11-
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2024/1/26.yaml
12-
original: nightly-2024-01-26
16+
sha256: 1d712c7dff52b68376c61a25d9fd642d0bca4498f0d5affb4086f6ea076b3930
17+
size: 604414
18+
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2024/2/24.yaml
19+
original: nightly-2024-02-24

stack.cabal

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ library
392392
, neat-interpolation
393393
, open-browser
394394
, optparse-applicative >=0.18.1.0
395-
, pantry >=0.9.3.1
395+
, pantry >=0.9.3.2
396396
, path >=0.9.5
397397
, path-io
398398
, persistent >=2.14.0.0 && <2.15
@@ -514,7 +514,7 @@ executable stack
514514
, neat-interpolation
515515
, open-browser
516516
, optparse-applicative >=0.18.1.0
517-
, pantry >=0.9.3.1
517+
, pantry >=0.9.3.2
518518
, path >=0.9.5
519519
, path-io
520520
, persistent >=2.14.0.0 && <2.15
@@ -617,7 +617,7 @@ executable stack-integration-test
617617
, open-browser
618618
, optparse-applicative >=0.18.1.0
619619
, optparse-generic
620-
, pantry >=0.9.3.1
620+
, pantry >=0.9.3.2
621621
, path >=0.9.5
622622
, path-io
623623
, persistent >=2.14.0.0 && <2.15
@@ -733,7 +733,7 @@ test-suite stack-unit-test
733733
, neat-interpolation
734734
, open-browser
735735
, optparse-applicative >=0.18.1.0
736-
, pantry >=0.9.3.1
736+
, pantry >=0.9.3.2
737737
, path >=0.9.5
738738
, path-io
739739
, persistent >=2.14.0.0 && <2.15

stack.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ extra-deps:
44
# Cabal is pruned because process is a GHC boot package, and has to be specified
55
# again.
66
- Cabal-3.10.1.0@sha256:6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94,12316
7+
- pantry-0.9.3.2@sha256:336373d8cbb10505ff16ac6e35cb9d8a7f45293a908de1c00f55c133ee7dde86,7511
78
# GHC 9.6.4 comes with process-1.6.17.0, which can segfault on macOS.
89
- process-1.6.18.0@sha256:cd0a3e0376b5a8525983d3131a31e52f9ffefc278ce635eec45a9d3987b8be3e,3025
910

stack.yaml.lock

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,13 @@ packages:
1111
size: 9223
1212
original:
1313
hackage: Cabal-3.10.1.0@sha256:6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94,12316
14+
- completed:
15+
hackage: pantry-0.9.3.2@sha256:336373d8cbb10505ff16ac6e35cb9d8a7f45293a908de1c00f55c133ee7dde86,7511
16+
pantry-tree:
17+
sha256: 820f4442ca96663fa57405f22385d216fbc1a28b9f49c7c82ad2a391803abe51
18+
size: 2722
19+
original:
20+
hackage: pantry-0.9.3.2@sha256:336373d8cbb10505ff16ac6e35cb9d8a7f45293a908de1c00f55c133ee7dde86,7511
1421
- completed:
1522
hackage: process-1.6.18.0@sha256:cd0a3e0376b5a8525983d3131a31e52f9ffefc278ce635eec45a9d3987b8be3e,3025
1623
pantry-tree:

0 commit comments

Comments
 (0)