From bb726a526e97740420cd695eb06c2ba7c800e503 Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Sun, 25 Feb 2024 15:36:21 +0000 Subject: [PATCH] Fix #5536 Depend on pantry-0.9.3.3 --- ChangeLog.md | 2 ++ package.yaml | 2 +- stack.cabal | 8 ++++---- stack.yaml | 3 +++ stack.yaml.lock | 11 +++++++++++ 5 files changed, 21 insertions(+), 5 deletions(-) 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..5cb55248d5 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.3 - 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.cabal b/stack.cabal index d4fe7706cb..23563dbae8 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.3 , 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.3 , 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.3 , 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.3 , path >=0.9.5 , path-io , persistent >=2.14.0.0 && <2.15 diff --git a/stack.yaml b/stack.yaml index ef7f002663..8b8b138820 100644 --- a/stack.yaml +++ b/stack.yaml @@ -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 diff --git a/stack.yaml.lock b/stack.yaml.lock index 42280fb8ac..a63703e687 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -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