diff --git a/ChangeLog.md b/ChangeLog.md index 80844144a9..310d23e1bd 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -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 diff --git a/package.yaml b/package.yaml index 52a368302c..e2976a425d 100644 --- a/package.yaml +++ b/package.yaml @@ -98,7 +98,7 @@ dependencies: - neat-interpolation - open-browser - optparse-applicative >= 0.18.1.0 -- pantry >= 0.9.3.1 +- pantry >= 0.9.3.2 - path >= 0.9.5 - path-io # In order for Cabal (the tool) to build Stack, it needs to be told of the diff --git a/stack-ghc-9.8.1.yaml b/stack-ghc-9.8.1.yaml index 3c55d36fdf..55bf16a7c3 100644 --- a/stack-ghc-9.8.1.yaml +++ b/stack-ghc-9.8.1.yaml @@ -2,7 +2,10 @@ # built with GHC 9.8.1. # GHC 9.8.1 -snapshot: nightly-2024-01-26 +snapshot: nightly-2024-02-24 + +extra-deps: +- pantry-0.9.3.2@sha256:336373d8cbb10505ff16ac6e35cb9d8a7f45293a908de1c00f55c133ee7dde86,7511 docker: enable: false diff --git a/stack-ghc-9.8.1.yaml.lock b/stack-ghc-9.8.1.yaml.lock index 3f8e18f500..c6c01b83be 100644 --- a/stack-ghc-9.8.1.yaml.lock +++ b/stack-ghc-9.8.1.yaml.lock @@ -3,10 +3,17 @@ # For more information, please see the documentation at: # https://docs.haskellstack.org/en/stable/lock_files -packages: [] +packages: +- completed: + hackage: pantry-0.9.3.2@sha256:336373d8cbb10505ff16ac6e35cb9d8a7f45293a908de1c00f55c133ee7dde86,7511 + pantry-tree: + sha256: 820f4442ca96663fa57405f22385d216fbc1a28b9f49c7c82ad2a391803abe51 + size: 2722 + original: + hackage: pantry-0.9.3.2@sha256:336373d8cbb10505ff16ac6e35cb9d8a7f45293a908de1c00f55c133ee7dde86,7511 snapshots: - completed: - sha256: 876a5c75d90718add42e1ad36d66000bf35050ce1c66748119897a32df613186 - size: 563963 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2024/1/26.yaml - original: nightly-2024-01-26 + sha256: 1d712c7dff52b68376c61a25d9fd642d0bca4498f0d5affb4086f6ea076b3930 + size: 604414 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2024/2/24.yaml + original: nightly-2024-02-24 diff --git a/stack.cabal b/stack.cabal index d4fe7706cb..22d8ac0992 100644 --- a/stack.cabal +++ b/stack.cabal @@ -393,7 +393,7 @@ library , neat-interpolation , open-browser , optparse-applicative >=0.18.1.0 - , pantry >=0.9.3.1 + , pantry >=0.9.3.2 , path >=0.9.5 , path-io , persistent >=2.14.0.0 && <2.15 @@ -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.2 , path >=0.9.5 , path-io , persistent >=2.14.0.0 && <2.15 @@ -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.2 , path >=0.9.5 , path-io , persistent >=2.14.0.0 && <2.15 @@ -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.2 , path >=0.9.5 , path-io , persistent >=2.14.0.0 && <2.15 diff --git a/stack.yaml b/stack.yaml index ef7f002663..99e414bff8 100644 --- a/stack.yaml +++ b/stack.yaml @@ -4,6 +4,7 @@ extra-deps: # Cabal is pruned because process is a GHC boot package, and has to be specified # again. - Cabal-3.10.1.0@sha256:6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94,12316 +- pantry-0.9.3.2@sha256:336373d8cbb10505ff16ac6e35cb9d8a7f45293a908de1c00f55c133ee7dde86,7511 # GHC 9.6.4 comes with process-1.6.17.0, which can segfault on macOS. - process-1.6.18.0@sha256:cd0a3e0376b5a8525983d3131a31e52f9ffefc278ce635eec45a9d3987b8be3e,3025 diff --git a/stack.yaml.lock b/stack.yaml.lock index 42280fb8ac..f2178217ec 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -11,6 +11,13 @@ packages: size: 9223 original: hackage: Cabal-3.10.1.0@sha256:6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94,12316 +- completed: + hackage: pantry-0.9.3.2@sha256:336373d8cbb10505ff16ac6e35cb9d8a7f45293a908de1c00f55c133ee7dde86,7511 + pantry-tree: + sha256: 820f4442ca96663fa57405f22385d216fbc1a28b9f49c7c82ad2a391803abe51 + size: 2722 + original: + hackage: pantry-0.9.3.2@sha256:336373d8cbb10505ff16ac6e35cb9d8a7f45293a908de1c00f55c133ee7dde86,7511 - completed: hackage: process-1.6.18.0@sha256:cd0a3e0376b5a8525983d3131a31e52f9ffefc278ce635eec45a9d3987b8be3e,3025 pantry-tree: