Skip to content

Commit

Permalink
Bump pantry to 0.5.6 commercialhaskell/pantry#53
Browse files Browse the repository at this point in the history
  • Loading branch information
snoyberg committed Jul 21, 2022
1 parent e14a2b7 commit 4f4e4dc
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
2 changes: 2 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ Bug fixes:
* Fix an inconsistency in the pretty formatting of the output of
`stack build --coverage`
* Fix repeated warning about missing parameters when using `stack new`
* Include `pantry-0.5.6`: Remove operational and mirror keys from bootstrap key
set [#53](https://github.com/commercialhaskell/pantry/pull/53)

## v2.7.5

Expand Down
2 changes: 1 addition & 1 deletion package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ dependencies:
- network-uri
- open-browser
- optparse-applicative >= 0.14.3.0
- pantry >= 0.5.3
- pantry >= 0.5.6
- casa-client
- casa-types
- path
Expand Down
1 change: 1 addition & 0 deletions stack-ghc-902.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ extra-deps:
- mustache-2.4.1@sha256:dc92ddbf90e3a64c3f2ec7785cf2937d6dcf6ffcebbc38ad9c8b33b6a70bb298,3180
# lts-19.11 is limited to hpack-0.34.7
- hpack-0.35.0@sha256:8cd6146fae269390f41dc7237ebd2c479074d4163806d349a41f5a7751d6cea5,4726
- pantry-0.5.6@rev:0 # https://github.com/commercialhaskell/pantry/pull/53

drop-packages:
# See https://github.com/commercialhaskell/stack/pull/4712
Expand Down
3 changes: 2 additions & 1 deletion stack-ghc-922.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ flags:
ghc-options:
"$locals": -fhide-source-paths

extra-deps: []
extra-deps:
- pantry-0.5.6@rev:0 # https://github.com/commercialhaskell/pantry/pull/53

drop-packages:
# See https://github.com/commercialhaskell/stack/pull/4712
Expand Down
22 changes: 9 additions & 13 deletions stack.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 2.0

-- This file has been generated from package.yaml by hpack version 0.35.0.
-- This file has been generated from package.yaml by hpack version 0.34.4.
--
-- see: https://github.com/sol/hpack

Expand Down Expand Up @@ -271,7 +271,7 @@ library
, network-uri
, open-browser
, optparse-applicative >=0.14.3.0
, pantry >=0.5.3
, pantry >=0.5.6
, path
, path-io
, persistent
Expand Down Expand Up @@ -306,7 +306,6 @@ library
, yaml
, zip-archive
, zlib
default-language: Haskell2010
if os(windows)
cpp-options: -DWINDOWS
build-depends:
Expand All @@ -332,6 +331,7 @@ library
src/unix/
c-sources:
src/unix/cbits/uname.c
default-language: Haskell2010

executable stack
main-is: Main.hs
Expand Down Expand Up @@ -394,7 +394,7 @@ executable stack
, network-uri
, open-browser
, optparse-applicative >=0.14.3.0
, pantry >=0.5.3
, pantry >=0.5.6
, path
, path-io
, persistent
Expand Down Expand Up @@ -430,7 +430,6 @@ executable stack
, yaml
, zip-archive
, zlib
default-language: Haskell2010
if os(windows)
cpp-options: -DWINDOWS
build-depends:
Expand All @@ -455,14 +454,13 @@ executable stack
cpp-options: -DHIDE_DEP_VERSIONS
if flag(supported-build)
cpp-options: -DSUPPORTED_BUILD
default-language: Haskell2010

executable stack-integration-test
main-is: IntegrationSpec.hs
other-modules:
StackTest
Paths_stack
autogen-modules:
Paths_stack
hs-source-dirs:
test/integration
test/integration/lib
Expand Down Expand Up @@ -518,7 +516,7 @@ executable stack-integration-test
, open-browser
, optparse-applicative >=0.14.3.0
, optparse-generic
, pantry >=0.5.3
, pantry >=0.5.6
, path
, path-io
, persistent
Expand Down Expand Up @@ -553,7 +551,6 @@ executable stack-integration-test
, yaml
, zip-archive
, zlib
default-language: Haskell2010
if os(windows)
cpp-options: -DWINDOWS
build-depends:
Expand All @@ -571,6 +568,7 @@ executable stack-integration-test
buildable: False
if flag(static)
ld-options: -static -pthread
default-language: Haskell2010

test-suite stack-test
type: exitcode-stdio-1.0
Expand All @@ -591,8 +589,6 @@ test-suite stack-test
Stack.Types.TemplateNameSpec
Stack.UploadSpec
Paths_stack
autogen-modules:
Paths_stack
hs-source-dirs:
src/test
ghc-options: -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns -fwarn-incomplete-record-updates -optP-Wno-nonportable-include-path -threaded
Expand Down Expand Up @@ -647,7 +643,7 @@ test-suite stack-test
, network-uri
, open-browser
, optparse-applicative >=0.14.3.0
, pantry >=0.5.3
, pantry >=0.5.6
, path
, path-io
, persistent
Expand Down Expand Up @@ -685,7 +681,6 @@ test-suite stack-test
, yaml
, zip-archive
, zlib
default-language: Haskell2010
if os(windows)
cpp-options: -DWINDOWS
build-depends:
Expand All @@ -699,5 +694,6 @@ test-suite stack-test
cpp-options: -DSTACK_DEVELOPER_MODE_DEFAULT=True
else
cpp-options: -DSTACK_DEVELOPER_MODE_DEFAULT=False
default-language: Haskell2010
build-tool-depends:
hspec-discover:hspec-discover
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ packages:

extra-deps:
- hpack-0.35.0@rev:0
- pantry-0.5.3@rev:0
- pantry-0.5.6@rev:0 # https://github.com/commercialhaskell/pantry/pull/53
- rio-0.1.21.0@rev:0


Expand Down

0 comments on commit 4f4e4dc

Please sign in to comment.