diff --git a/ChangeLog.md b/ChangeLog.md index 48180d94cc..bad538db6e 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -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 diff --git a/package.yaml b/package.yaml index 2fe604bf28..c772bdd680 100644 --- a/package.yaml +++ b/package.yaml @@ -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 diff --git a/stack-ghc-902.yaml b/stack-ghc-902.yaml index f9fe4a1d66..6928869675 100644 --- a/stack-ghc-902.yaml +++ b/stack-ghc-902.yaml @@ -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 diff --git a/stack-ghc-922.yaml b/stack-ghc-922.yaml index 4bd270e7d9..11430f72e5 100644 --- a/stack-ghc-922.yaml +++ b/stack-ghc-922.yaml @@ -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 diff --git a/stack.cabal b/stack.cabal index 5bb8c398ed..8ab716a14d 100644 --- a/stack.cabal +++ b/stack.cabal @@ -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 @@ -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 @@ -306,7 +306,6 @@ library , yaml , zip-archive , zlib - default-language: Haskell2010 if os(windows) cpp-options: -DWINDOWS build-depends: @@ -332,6 +331,7 @@ library src/unix/ c-sources: src/unix/cbits/uname.c + default-language: Haskell2010 executable stack main-is: Main.hs @@ -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 @@ -430,7 +430,6 @@ executable stack , yaml , zip-archive , zlib - default-language: Haskell2010 if os(windows) cpp-options: -DWINDOWS build-depends: @@ -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 @@ -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 @@ -553,7 +551,6 @@ executable stack-integration-test , yaml , zip-archive , zlib - default-language: Haskell2010 if os(windows) cpp-options: -DWINDOWS build-depends: @@ -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 @@ -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 @@ -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 @@ -685,7 +681,6 @@ test-suite stack-test , yaml , zip-archive , zlib - default-language: Haskell2010 if os(windows) cpp-options: -DWINDOWS build-depends: @@ -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 diff --git a/stack.yaml b/stack.yaml index 1bf4b0db4c..954949e5ac 100644 --- a/stack.yaml +++ b/stack.yaml @@ -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