Skip to content

Commit

Permalink
Fix #5536 Depend on pantry-0.9.3.3
Browse files Browse the repository at this point in the history
  • Loading branch information
mpilgrem committed Feb 25, 2024
1 parent 76dffce commit bb726a5
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 5 deletions.
2 changes: 2 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ Bug fixes:
* `--haddock-for-hackage` does not ignore `--haddock-arguments`.
* The `config set snapshot` and `config set resolver` commands now respect the
presence of a synoymous key.
* On Windows, package locations that are Git repositories with submodules now
work as intended.

## v2.15.1 - 2024-02-09

Expand Down
2 changes: 1 addition & 1 deletion package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ dependencies:
- neat-interpolation
- open-browser
- optparse-applicative >= 0.18.1.0
- pantry >= 0.9.3.1
- pantry >= 0.9.3.3
- path >= 0.9.5
- path-io
# In order for Cabal (the tool) to build Stack, it needs to be told of the
Expand Down
8 changes: 4 additions & 4 deletions stack.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ library
, neat-interpolation
, open-browser
, optparse-applicative >=0.18.1.0
, pantry >=0.9.3.1
, pantry >=0.9.3.3
, path >=0.9.5
, path-io
, persistent >=2.14.0.0 && <2.15
Expand Down Expand Up @@ -515,7 +515,7 @@ executable stack
, neat-interpolation
, open-browser
, optparse-applicative >=0.18.1.0
, pantry >=0.9.3.1
, pantry >=0.9.3.3
, path >=0.9.5
, path-io
, persistent >=2.14.0.0 && <2.15
Expand Down Expand Up @@ -618,7 +618,7 @@ executable stack-integration-test
, open-browser
, optparse-applicative >=0.18.1.0
, optparse-generic
, pantry >=0.9.3.1
, pantry >=0.9.3.3
, path >=0.9.5
, path-io
, persistent >=2.14.0.0 && <2.15
Expand Down Expand Up @@ -734,7 +734,7 @@ test-suite stack-unit-test
, neat-interpolation
, open-browser
, optparse-applicative >=0.18.1.0
, pantry >=0.9.3.1
, pantry >=0.9.3.3
, path >=0.9.5
, path-io
, persistent >=2.14.0.0 && <2.15
Expand Down
3 changes: 3 additions & 0 deletions stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ extra-deps:
- Cabal-3.10.1.0@sha256:6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94,12316
# GHC 9.6.4 comes with process-1.6.17.0, which can segfault on macOS.
- process-1.6.18.0@sha256:cd0a3e0376b5a8525983d3131a31e52f9ffefc278ce635eec45a9d3987b8be3e,3025
# Will need to be updated when pantry-0.9.3.3 is released
- git: https://github.com/commercialhaskell/pantry.git
commit: 838d3671cccb693ccdb9db861d09aef83e7d2895

docker:
enable: false
Expand Down
11 changes: 11 additions & 0 deletions stack.yaml.lock
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,17 @@ packages:
size: 1675
original:
hackage: process-1.6.18.0@sha256:cd0a3e0376b5a8525983d3131a31e52f9ffefc278ce635eec45a9d3987b8be3e,3025
- completed:
commit: 838d3671cccb693ccdb9db861d09aef83e7d2895
git: https://github.com/commercialhaskell/pantry.git
name: pantry
pantry-tree:
sha256: 4d2355fa7213f42b19ae07f4d07fa759e922e9022ef5b5fc5e1a8032094dfab9
size: 3632
version: 0.9.3.3
original:
commit: 838d3671cccb693ccdb9db861d09aef83e7d2895
git: https://github.com/commercialhaskell/pantry.git
snapshots:
- completed:
sha256: 7b975b104cb3dbf0c297dfd01f936a4d2ee523241dd0b1ae960522b833fe3027
Expand Down

0 comments on commit bb726a5

Please sign in to comment.