Skip to content

Commit 468b4b2

Browse files
authored
Merge pull request #5537 from commercialhaskell/bump-pantry
Bump pantry version
2 parents d1eef3f + 477abe0 commit 468b4b2

File tree

6 files changed

+14
-9
lines changed

6 files changed

+14
-9
lines changed

ChangeLog.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ Bug fixes:
2020
* `stack setup` always looks for the unpacked directory name to support
2121
different tar file naming conventions. See
2222
[#5545](https://github.com/commercialhaskell/stack/issues/5545)
23+
* Bump `pantry` version for better OS support. See
24+
[pantry#33](https://github.com/commercialhaskell/pantry/issues/33)
25+
2326

2427
## v2.7.1
2528

package.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ dependencies:
9292
- network-uri
9393
- open-browser
9494
- optparse-applicative >= 0.14.3.0
95-
- pantry >= 0.5.1.3
95+
- pantry >= 0.5.2
9696
- casa-client
9797
- casa-types
9898
- path

stack-ghc-88.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ extra-deps:
2727
- hpack-0.33.0@rev:0
2828
- http-download-0.2.0.0@rev:0
2929
- filelock-0.1.1.5@rev:0
30-
- pantry-0.5.1.5@rev:0
30+
- pantry-0.5.2@rev:0
3131
- casa-client-0.0.1@rev:0
3232
- casa-types-0.0.1@rev:0
3333
- rio-0.1.19.0@rev:0

stack-nightly.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ flags:
1919
ghc-options:
2020
"$locals": -fhide-source-paths
2121

22-
extra-deps: []
22+
extra-deps:
23+
- pantry-0.5.2@rev:0
2324

2425
drop-packages:
2526
# See https://github.com/commercialhaskell/stack/pull/4712

stack.cabal

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ cabal-version: 2.0
44
--
55
-- see: https://github.com/sol/hpack
66
--
7-
-- hash: a6afbb611def761b0f0cda3b18f0ad7b389f64eb534a982f0b06bce4e4474632
7+
-- hash: 4d6bc382d1f25fc7283e144b701061b38a5f10879c44997cfdc0b9f3147ce352
88

99
name: stack
1010
version: 2.8.0
@@ -274,7 +274,7 @@ library
274274
, network-uri
275275
, open-browser
276276
, optparse-applicative >=0.14.3.0
277-
, pantry >=0.5.1.3
277+
, pantry >=0.5.2
278278
, path
279279
, path-io
280280
, persistent
@@ -398,7 +398,7 @@ executable stack
398398
, network-uri
399399
, open-browser
400400
, optparse-applicative >=0.14.3.0
401-
, pantry >=0.5.1.3
401+
, pantry >=0.5.2
402402
, path
403403
, path-io
404404
, persistent
@@ -521,7 +521,7 @@ executable stack-integration-test
521521
, open-browser
522522
, optparse-applicative >=0.14.3.0
523523
, optparse-generic
524-
, pantry >=0.5.1.3
524+
, pantry >=0.5.2
525525
, path
526526
, path-io
527527
, persistent
@@ -649,7 +649,7 @@ test-suite stack-test
649649
, network-uri
650650
, open-browser
651651
, optparse-applicative >=0.14.3.0
652-
, pantry >=0.5.1.3
652+
, pantry >=0.5.2
653653
, path
654654
, path-io
655655
, persistent

stack.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ flags:
2020
ghc-options:
2121
"$locals": -fhide-source-paths
2222

23-
extra-deps: []
23+
extra-deps:
24+
- pantry-0.5.2@rev:0
2425

2526
drop-packages:
2627
# See https://github.com/commercialhaskell/stack/pull/4712

0 commit comments

Comments
 (0)