From 9c4db028c4ff6a9848ee10eef3c43490113a5158 Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Sat, 2 Dec 2023 19:14:07 +0000 Subject: [PATCH] Fix #6192 Depend on pantry >= 0.9.3 pantry-0.9.3 provides better error messages when a local archive file does not exist. --- package.yaml | 2 +- stack-ghc-9.6.3.yaml | 2 ++ stack-ghc-9.6.3.yaml.lock | 7 +++++++ stack.cabal | 8 ++++---- stack.yaml | 2 +- stack.yaml.lock | 6 +++--- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/package.yaml b/package.yaml index 1765d1b5c4..c97fa0eac4 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.2 +- pantry >= 0.9.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-ghc-9.6.3.yaml b/stack-ghc-9.6.3.yaml index 4764f3b682..3f49192cf3 100644 --- a/stack-ghc-9.6.3.yaml +++ b/stack-ghc-9.6.3.yaml @@ -8,6 +8,8 @@ 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 +# nightly-2023-12-01 comes with pantry-0.9.2. +- pantry-0.9.3@sha256:ad7109ed18a3e8a61e7cd3c490fe7566384de974df1e50771b6f458ad13467a5,7810 # GHC 9.6.3 comes with process-1.6.17.0, which can segfault on macOS. - process-1.6.18.0@sha256:cd0a3e0376b5a8525983d3131a31e52f9ffefc278ce635eec45a9d3987b8be3e,3025 diff --git a/stack-ghc-9.6.3.yaml.lock b/stack-ghc-9.6.3.yaml.lock index 2ea9c8c2a4..132fb10467 100644 --- a/stack-ghc-9.6.3.yaml.lock +++ b/stack-ghc-9.6.3.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@sha256:ad7109ed18a3e8a61e7cd3c490fe7566384de974df1e50771b6f458ad13467a5,7810 + pantry-tree: + sha256: 9ef35da9d202839cb1c05b439b4c616fc4e09482290acff2027ab34117ea3ce9 + size: 2665 + original: + hackage: pantry-0.9.3@sha256:ad7109ed18a3e8a61e7cd3c490fe7566384de974df1e50771b6f458ad13467a5,7810 - completed: hackage: process-1.6.18.0@sha256:cd0a3e0376b5a8525983d3131a31e52f9ffefc278ce635eec45a9d3987b8be3e,3025 pantry-tree: diff --git a/stack.cabal b/stack.cabal index e72dbd4da5..2e313ef605 100644 --- a/stack.cabal +++ b/stack.cabal @@ -381,7 +381,7 @@ library , neat-interpolation , open-browser , optparse-applicative >=0.18.1.0 - , pantry >=0.9.2 + , pantry >=0.9.3 , path >=0.9.5 , path-io , persistent >=2.14.0.0 && <2.15 @@ -503,7 +503,7 @@ executable stack , neat-interpolation , open-browser , optparse-applicative >=0.18.1.0 - , pantry >=0.9.2 + , pantry >=0.9.3 , path >=0.9.5 , path-io , persistent >=2.14.0.0 && <2.15 @@ -606,7 +606,7 @@ executable stack-integration-test , open-browser , optparse-applicative >=0.18.1.0 , optparse-generic - , pantry >=0.9.2 + , pantry >=0.9.3 , path >=0.9.5 , path-io , persistent >=2.14.0.0 && <2.15 @@ -722,7 +722,7 @@ test-suite stack-unit-test , neat-interpolation , open-browser , optparse-applicative >=0.18.1.0 - , pantry >=0.9.2 + , pantry >=0.9.3 , path >=0.9.5 , path-io , persistent >=2.14.0.0 && <2.15 diff --git a/stack.yaml b/stack.yaml index 000f1d5e62..a628ecf218 100644 --- a/stack.yaml +++ b/stack.yaml @@ -19,7 +19,7 @@ extra-deps: - http-download-0.2.1.0@sha256:a97863e96f7d44efc3d0e3061db7fe2540b8374ca44ae90d0b56040140cb7506,1716 - optparse-applicative-0.18.1.0@sha256:b4cf8d9018e5e67cb1f14edb5130b6d05ad8bc1b5f6bd4efaa6ec0b7f28f559d,5132 - optparse-generic-1.5.1@sha256:c65a7d3429feedf870f5a9f7f0d2aaf75609888b52449f85f22871b5f5a7e95f,2204 -- pantry-0.9.2@sha256:e1c5444d1b4003435d860853abd21e91e5fc337f2b2e2c8c992a2bac04712dc0,7650 +- pantry-0.9.3@sha256:ad7109ed18a3e8a61e7cd3c490fe7566384de974df1e50771b6f458ad13467a5,7810 - static-bytes-0.1.0@sha256:35dbf30f617baa0151682c97687042516be07872a39984f9fe31f78125b962bf,1627 - tar-conduit-0.4.0@sha256:f333649770f5ec42a83a93b0d424cf6bb895d80dfbee05a54340395f81d036ae,3126 - tls-1.9.0@sha256:8ad332dc0224decb1b137bf6c9678b4f786487b9aaa5c9068cd3ad19d42c39a7,5571 diff --git a/stack.yaml.lock b/stack.yaml.lock index dbaeb14748..5eb6621b18 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -110,12 +110,12 @@ packages: original: hackage: optparse-generic-1.5.1@sha256:c65a7d3429feedf870f5a9f7f0d2aaf75609888b52449f85f22871b5f5a7e95f,2204 - completed: - hackage: pantry-0.9.2@sha256:e1c5444d1b4003435d860853abd21e91e5fc337f2b2e2c8c992a2bac04712dc0,7650 + hackage: pantry-0.9.3@sha256:ad7109ed18a3e8a61e7cd3c490fe7566384de974df1e50771b6f458ad13467a5,7810 pantry-tree: - sha256: 8f14d90ab352a42847bcffa6cf814e45543b8aa4a56c71b3c74eba6beec3b831 + sha256: 9ef35da9d202839cb1c05b439b4c616fc4e09482290acff2027ab34117ea3ce9 size: 2665 original: - hackage: pantry-0.9.2@sha256:e1c5444d1b4003435d860853abd21e91e5fc337f2b2e2c8c992a2bac04712dc0,7650 + hackage: pantry-0.9.3@sha256:ad7109ed18a3e8a61e7cd3c490fe7566384de974df1e50771b6f458ad13467a5,7810 - completed: hackage: static-bytes-0.1.0@sha256:35dbf30f617baa0151682c97687042516be07872a39984f9fe31f78125b962bf,1627 pantry-tree: