From fbd6542b8102ab25e0c9652b4ab8c4825acfae35 Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Sun, 18 Jun 2023 13:27:11 +0100 Subject: [PATCH 1/5] Update stack.yaml --- stack.yaml | 23 ++++++----------- stack.yaml.lock | 65 ++++++------------------------------------------- 2 files changed, 16 insertions(+), 72 deletions(-) diff --git a/stack.yaml b/stack.yaml index 3727e8a55e..b581d977a2 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,33 +1,25 @@ -# GHC 9.2.8 -resolver: lts-20.26 +resolver: lts-21.8 # GHC 9.4.6 extra-deps: -# lts-20.26 specifies Cabal-3.6.3.0 -- Cabal-3.8.1.0@sha256:155d64beeecbae2b19e5d67844532494af88bc8795d4db4146a0c29296f59967,12220 -# lts-20.26 specifies Cabal-syntax-3.6.0.0 -- Cabal-syntax-3.8.1.0@sha256:4936765e9a7a8ecbf8fdbe9067f6d972bc0299220063abb2632a9950af64b966,7619 - aeson-warning-parser-0.1.0@sha256:f2c1c42b73aa35d352060abcbb867c410cbbf57d0cb0fed607bcd1e2a74954ad,1308 - ansi-terminal-1.0@sha256:640ffecfd95471388d939fcacb57bdc0cef15f0457746c234a12cdd5a6c6d1e8,2706 -- ansi-terminal-types-0.11.5@sha256:f78440dfd95c4509e88855ac7cc2d9566ddf956a92c1290404cac93ad1a1b00a,1482 -- casa-client-0.0.2@sha256:1e27a6678c511b3372c4e97ab1a4a9eca4eca8a0a090eac103a1806ce7c8584d,888 +# Required because ansi-wl-pprint-0.6.9 specifies ansi-terminal < 0.12. See: +# https://github.com/ekmett/ansi-wl-pprint/issues/29 +- ansi-wl-pprint-1.0.2@sha256:b817853b5310b8e7847469847608b664c3e75b4b30c332f2cb8c0d00751ef9c1,1915 - companion-0.1.0@sha256:99f6de52c832d433639232a6d77d33abbca3b3037e49b7db6242fb9f569a8a2b,1093 - crypton-0.33@sha256:5e92f29b9b7104d91fcdda1dec9400c9ad1f1791c231cc41ceebd783fb517dee,18202 -- crypton-conduit-0.2.3@sha256:31f44243b42f344c65be6cd2c39c07994d9186d19d15988656620d1de85aca37,1946 - crypton-connection-0.3.1@sha256:4d0958537197956b536ea91718b1749949757022532f50b8f683290056a19021,1581 - crypton-x509-1.7.6@sha256:c567657a705b6d6521f9dd2de999bf530d618ec00f3b939df76a41fb0fe94281,2339 - crypton-x509-store-1.6.9@sha256:422b9b9f87a7382c66385d047615b16fc86a68c08ea22b1e0117c143a2d44050,1750 - crypton-x509-system-1.6.7@sha256:023ed573d82983bc473a37a89e0434a085b413be9f68d07e085361056afd4637,1532 - crypton-x509-validation-1.6.12@sha256:85989721b64be4b90de9f66ef641c26f57575cffed1a50d707065fb60176f386,2227 -- fsnotify-0.4.1.0@sha256:44540beabea36aeeef930aa4d5f28091d431904bc9923b6ac4d358831c651235,2854 -# lts-20.23 specifies hpack-0.35.2 +# lts-21.8 specifies hpack-0.35.2 - hpack-0.35.4@sha256:171eaba080e308d26f16cb1b8f77d2b6a2899cf4ff98085912be167f8136ffef,5119 - http-client-tls-0.3.6.2@sha256:a9362782ddbc1d1f84a2919bbb1b224cefd2b24071b81c3aeb5c5c8d6a1fdb0f,2004 - http-download-0.2.1.0@sha256:a97863e96f7d44efc3d0e3061db7fe2540b8374ca44ae90d0b56040140cb7506,1716 - optparse-applicative-0.18.1.0@sha256:b4cf8d9018e5e67cb1f14edb5130b6d05ad8bc1b5f6bd4efaa6ec0b7f28f559d,5132 - optparse-generic-1.5.0@sha256:1de163cf439350d2c5817dd9067b51eeb62d6fdd4e2f0a70c06c9e1b931c38d7,2285 - pantry-0.9.2@sha256:e1c5444d1b4003435d860853abd21e91e5fc337f2b2e2c8c992a2bac04712dc0,7650 -- persistent-2.14.5.0@sha256:c3c7a6a200930f956b2a6bb15b9d2cd512980692f6a2d95368a6db335c34c916,7199 -- rio-prettyprint-0.1.4.0@sha256:1f8eb3ead0ef33d3736d53e1de5e9b2c91a0c207cdca23321bd74c401e85f23a,1301 - static-bytes-0.1.0@sha256:35dbf30f617baa0151682c97687042516be07872a39984f9fe31f78125b962bf,1627 - tar-conduit-0.4.0@sha256:f333649770f5ec42a83a93b0d424cf6bb895d80dfbee05a54340395f81d036ae,3126 - tls-1.7.0@sha256:fa82e9ca8fd887b66fba8433b3ba1db4e5e047fe7c815707f06209679d04177b,5566 @@ -38,7 +30,7 @@ drop-packages: docker: enable: false - repo: glcr.b-data.ch/ghc/ghc-musl:9.2.8 + repo: glcr.b-data.ch/ghc/ghc-musl:9.4.6 nix: # --nix on the command-line to enable. @@ -48,7 +40,8 @@ nix: flags: hackage-security: - Cabal-syntax: true + cabal-syntax: true + # GHC 9.4.6's boot library is Win32-2.12.0.1 mintty: win32-2-13-1: false stack: diff --git a/stack.yaml.lock b/stack.yaml.lock index aade5de396..217f3918a0 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -4,20 +4,6 @@ # https://docs.haskellstack.org/en/stable/lock_files packages: -- completed: - hackage: Cabal-3.8.1.0@sha256:155d64beeecbae2b19e5d67844532494af88bc8795d4db4146a0c29296f59967,12220 - pantry-tree: - sha256: 0df207f33a2167f23ab8192b3c1e5722b60836bcdde18a0b5b24fb85b41c05ef - size: 8955 - original: - hackage: Cabal-3.8.1.0@sha256:155d64beeecbae2b19e5d67844532494af88bc8795d4db4146a0c29296f59967,12220 -- completed: - hackage: Cabal-syntax-3.8.1.0@sha256:4936765e9a7a8ecbf8fdbe9067f6d972bc0299220063abb2632a9950af64b966,7619 - pantry-tree: - sha256: 0471cade235bb93e1fd32630f6d5fa69735a879d2712f47067c51bed0c46d536 - size: 11052 - original: - hackage: Cabal-syntax-3.8.1.0@sha256:4936765e9a7a8ecbf8fdbe9067f6d972bc0299220063abb2632a9950af64b966,7619 - completed: hackage: aeson-warning-parser-0.1.0@sha256:f2c1c42b73aa35d352060abcbb867c410cbbf57d0cb0fed607bcd1e2a74954ad,1308 pantry-tree: @@ -33,19 +19,12 @@ packages: original: hackage: ansi-terminal-1.0@sha256:640ffecfd95471388d939fcacb57bdc0cef15f0457746c234a12cdd5a6c6d1e8,2706 - completed: - hackage: ansi-terminal-types-0.11.5@sha256:f78440dfd95c4509e88855ac7cc2d9566ddf956a92c1290404cac93ad1a1b00a,1482 + hackage: ansi-wl-pprint-1.0.2@sha256:b817853b5310b8e7847469847608b664c3e75b4b30c332f2cb8c0d00751ef9c1,1915 pantry-tree: - sha256: 0a03e697837c4fae43543f3be0fcf9d88157ba637fbd1b656fc8bf79b1656a14 - size: 291 + sha256: 3be652ff37d9ff697cb60ac1a7c544ee2cfb22f56e570f800f896355e04dd2e1 + size: 390 original: - hackage: ansi-terminal-types-0.11.5@sha256:f78440dfd95c4509e88855ac7cc2d9566ddf956a92c1290404cac93ad1a1b00a,1482 -- completed: - hackage: casa-client-0.0.2@sha256:1e27a6678c511b3372c4e97ab1a4a9eca4eca8a0a090eac103a1806ce7c8584d,888 - pantry-tree: - sha256: c72d43eca832cc3c9a3074e86b39815de788cda6de966dfae4471194e9abd17d - size: 167 - original: - hackage: casa-client-0.0.2@sha256:1e27a6678c511b3372c4e97ab1a4a9eca4eca8a0a090eac103a1806ce7c8584d,888 + hackage: ansi-wl-pprint-1.0.2@sha256:b817853b5310b8e7847469847608b664c3e75b4b30c332f2cb8c0d00751ef9c1,1915 - completed: hackage: companion-0.1.0@sha256:99f6de52c832d433639232a6d77d33abbca3b3037e49b7db6242fb9f569a8a2b,1093 pantry-tree: @@ -60,13 +39,6 @@ packages: size: 23148 original: hackage: crypton-0.33@sha256:5e92f29b9b7104d91fcdda1dec9400c9ad1f1791c231cc41ceebd783fb517dee,18202 -- completed: - hackage: crypton-conduit-0.2.3@sha256:31f44243b42f344c65be6cd2c39c07994d9186d19d15988656620d1de85aca37,1946 - pantry-tree: - sha256: 06781001956f2ccfae0e6b4f33c213bd3121c6462f8534e9dca87bf51e4663e0 - size: 592 - original: - hackage: crypton-conduit-0.2.3@sha256:31f44243b42f344c65be6cd2c39c07994d9186d19d15988656620d1de85aca37,1946 - completed: hackage: crypton-connection-0.3.1@sha256:4d0958537197956b536ea91718b1749949757022532f50b8f683290056a19021,1581 pantry-tree: @@ -102,13 +74,6 @@ packages: size: 639 original: hackage: crypton-x509-validation-1.6.12@sha256:85989721b64be4b90de9f66ef641c26f57575cffed1a50d707065fb60176f386,2227 -- completed: - hackage: fsnotify-0.4.1.0@sha256:44540beabea36aeeef930aa4d5f28091d431904bc9923b6ac4d358831c651235,2854 - pantry-tree: - sha256: f8e89e81fe0ca6e285036e04b165119ccfc59e7e668c1bfc28927f39062c5949 - size: 1280 - original: - hackage: fsnotify-0.4.1.0@sha256:44540beabea36aeeef930aa4d5f28091d431904bc9923b6ac4d358831c651235,2854 - completed: hackage: hpack-0.35.4@sha256:171eaba080e308d26f16cb1b8f77d2b6a2899cf4ff98085912be167f8136ffef,5119 pantry-tree: @@ -151,20 +116,6 @@ packages: size: 2665 original: hackage: pantry-0.9.2@sha256:e1c5444d1b4003435d860853abd21e91e5fc337f2b2e2c8c992a2bac04712dc0,7650 -- completed: - hackage: persistent-2.14.5.0@sha256:c3c7a6a200930f956b2a6bb15b9d2cd512980692f6a2d95368a6db335c34c916,7199 - pantry-tree: - sha256: 2a19d852adcf86df474c144dd5a17edbf08a3aeac2624678687e7147ce6218df - size: 6601 - original: - hackage: persistent-2.14.5.0@sha256:c3c7a6a200930f956b2a6bb15b9d2cd512980692f6a2d95368a6db335c34c916,7199 -- completed: - hackage: rio-prettyprint-0.1.4.0@sha256:1f8eb3ead0ef33d3736d53e1de5e9b2c91a0c207cdca23321bd74c401e85f23a,1301 - pantry-tree: - sha256: 05bb2585e2d93899c62e0b6e1da02d040286b4524d0d363be1c5d99e49ac95bd - size: 628 - original: - hackage: rio-prettyprint-0.1.4.0@sha256:1f8eb3ead0ef33d3736d53e1de5e9b2c91a0c207cdca23321bd74c401e85f23a,1301 - completed: hackage: static-bytes-0.1.0@sha256:35dbf30f617baa0151682c97687042516be07872a39984f9fe31f78125b962bf,1627 pantry-tree: @@ -188,7 +139,7 @@ packages: hackage: tls-1.7.0@sha256:fa82e9ca8fd887b66fba8433b3ba1db4e5e047fe7c815707f06209679d04177b,5566 snapshots: - completed: - sha256: 5a59b2a405b3aba3c00188453be172b85893cab8ebc352b1ef58b0eae5d248a2 - size: 650475 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/26.yaml - original: lts-20.26 + sha256: 0be74c2dd964ab0e8887c1ece93b7c02e1cc2af11f5e3cc334300a5871e73917 + size: 640028 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/8.yaml + original: lts-21.8 From 4d7aa4da0ade76bcaf85f55f200dab64d840a5c5 Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Sun, 18 Jun 2023 13:44:55 +0100 Subject: [PATCH 2/5] Replace ghc-9.2.7->9.4.6 and lts-20.23->lts-21.8 Also, update `etc/dockerfiles/arm64.Dockerfile`, `etc/scripts/build-stack-installer.hs` and `etc/scripts/release.hs`. --- etc/scripts/build-stack-installer.hs | 2 +- etc/scripts/release.hs | 9 +++------ src/Stack/Init.hs | 4 ++-- test/integration/lib/StackTest.hs | 2 +- .../files/my-snapshot.yaml | 2 +- .../tests/1265-extensible-snapshots/Main.hs | 2 +- .../files/snapshot-2.yaml | 9 +++++---- .../files/snapshot-modify-lts.yaml | 2 +- .../files/snapshots/local-snapshot.yaml | 2 +- .../files/snapshots/remote-snapshot.yaml | 4 ++-- .../1337-unicode-everywhere/files/stack.yaml | 2 +- .../files/stack-everything.yaml | 2 +- .../files/stack-locals.yaml | 2 +- .../files/stack-name.yaml | 2 +- .../files/stack-targets.yaml | 2 +- .../1659-skip-component/files/stack.yaml | 2 +- .../1884-url-to-tarball/files/stack.yaml | 2 +- .../tests/2195-depend-on-exe/files/stack.yaml | 2 +- .../tests/2433-ghc-by-version/files/run.sh | 6 +++--- .../tests/2781-shadow-bug/files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../tests/32-unlisted-module/files/stack.yaml | 2 +- .../3315-multi-ghc-options/files/stack.yaml | 2 +- .../335-multi-package-flags/files/stack.yaml | 2 +- .../3390-unbuildable-test/files/stack.yaml | 2 +- .../files/my-snapshot.yaml | 2 +- .../files/custom1/custom1.yaml | 2 +- .../files/custom2/custom2.yaml | 2 +- .../345-override-bytestring/files/stack.yaml | 2 +- .../files/orig-stack.yaml | 2 +- .../3574-extra-dep-local/files/stack.yaml | 2 +- .../3591-cabal-warnings-once/files/stack.yaml | 2 +- .../365-invalid-success/files/stack.yaml | 2 +- .../tests/366-non-root-dir/files/stack.yaml | 2 +- .../370-invalid-setup-hs/files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../files/snapshot.yaml | 2 +- .../files/stack-bad.yaml | 2 +- .../tests/3863-purge-command/files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../files/files.cabal | 3 ++- .../files/stack.yaml | 6 +++--- .../files/no-base-upgrade.yaml | 2 +- .../files/unattainable-base.yaml | 2 +- .../files/test-stack.yml | 2 +- .../3959-order-of-flags/files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../4044-no-run-tests-config/files/stack.yaml | 2 +- .../tests/4095-utf8-pure-nix/files/stack.yaml | 5 ++++- .../tests/4101-dependency-tree/Main.hs | 20 +++++++++---------- .../4101-dependency-tree/files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../4215-missing-unregister/files/stack1.yaml | 2 +- .../4215-missing-unregister/files/stack2.yaml | 2 +- .../tests/4270-files-order/files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../tests/4390-dot-no-ghc/files/stack.yaml | 2 +- .../tests/4453-detailed/files/stack.yaml | 2 +- .../files/stack-bad.yaml | 2 +- .../files/stack-good.yaml | 2 +- .../4754-rebuild-haddocks/files/stack.yaml | 2 +- .../4783-doctest-deps/files/snapshot.yaml | 2 +- .../4897-boot-package-pruned/files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../tests/5180-ghc-rts-flags/files/stack.yaml | 2 +- .../tests/5272-only-locals/files/stack.yaml | 2 +- .../files/package-a/stack.yaml | 2 +- .../files/package-b/stack.yaml | 2 +- .../files/package-c/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../tests/617-extra-dep-flag/files/stack.yaml | 2 +- .../617-unused-flag-cli/files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../617-unused-flag-yaml/files/stack.yaml | 2 +- .../tests/620-env-command/files/run.sh | 4 ++-- .../tests/717-sdist-test/files/stack.yaml | 2 +- .../763-buildable-false/files/stack.yaml | 2 +- .../tests/796-ghc-options/files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../tests/cabal-non-buildable-bug/Main.hs | 8 +++++--- .../tests/cabal-sublibrary-dependency/Main.hs | 8 ++++---- .../files/stack.yaml | 2 +- .../tests/copy-bins-works/files/stack.yaml | 2 +- .../tests/cyclic-test-deps/Main.hs | 6 +++--- .../tests/drop-packages/files/stack.yaml | 2 +- .../duplicate-package-ids/files/stack1.yaml | 2 +- .../duplicate-package-ids/files/stack2.yaml | 2 +- .../tests/ghc-install-hooks/files/run.sh | 6 +++--- .../tests/haddock-options/files/stack.yaml | 2 +- .../tests/hpack-repo/files/stack.yaml | 2 +- .../tests/init-omit-packages/Main.hs | 4 ++-- .../tests/internal-libraries/Main.hs | 7 +++---- .../tests/lock-files/files/stack-1-extra | 2 +- .../tests/lock-files/files/stack-2-extras | 2 +- .../files/stack.yaml | 2 +- .../tests/multi-test/files/stack.yaml | 2 +- .../files/filepath-1.4.2.2/filepath.cabal | 2 +- .../tests/mutable-deps/files/stack.yaml | 4 ++-- .../tests/nice-resolver-names/Main.hs | 2 +- .../tests/no-rerun-tests/files/stack.yaml | 2 +- .../tests/override-compiler/Main.hs | 2 +- .../tests/override-compiler/files/stack.yaml | 4 ++-- .../tests/proper-rebuilds/files/stack.yaml | 2 +- .../files/subdir/snapshot.yaml | 2 +- .../files/as-extra-dep.yaml | 2 +- .../files/snapshot.yaml | 2 +- .../integration/tests/upload/files/stack.yaml | 2 +- .../tests/watched-files/files/stack.yaml | 2 +- 112 files changed, 154 insertions(+), 151 deletions(-) diff --git a/etc/scripts/build-stack-installer.hs b/etc/scripts/build-stack-installer.hs index 57b02ae84d..59be46a2cc 100644 --- a/etc/scripts/build-stack-installer.hs +++ b/etc/scripts/build-stack-installer.hs @@ -1,5 +1,5 @@ {- stack script - --resolver lts-20.26 + --resolver lts-21.8 --install-ghc --package nsis -} diff --git a/etc/scripts/release.hs b/etc/scripts/release.hs index 30e25eb049..aff73ed492 100644 --- a/etc/scripts/release.hs +++ b/etc/scripts/release.hs @@ -1,7 +1,5 @@ {- stack script - --resolver lts-20.26 - --extra-dep Cabal-3.6.3.0 - --extra-dep directory-1.3.6.2 + --resolver lts-21.8 --ghc-options -Wall -} @@ -9,9 +7,8 @@ -- interpreter options comment, Stack deduces the required packages from the -- module imports, being: Cabal, base, bytestring, directory, extra, process, -- shake, tar, zip-archive and zlib. These are either GHC boot packages or in --- the snapshot. However, Stackage LTS 20.26 includes `Win32` directly, which --- results in `Cabal` and `directory` being 'replaced' on Windows. Consequently, --- they need to be specified as extra deps. +-- the snapshot. Stackage LTS Haskell 21.8 does not include boot packages +-- directly. {-# LANGUAGE PatternSynonyms #-} {-# LANGUAGE RecordWildCards #-} diff --git a/src/Stack/Init.hs b/src/Stack/Init.hs index f79693c0c5..3af202795b 100644 --- a/src/Stack/Init.hs +++ b/src/Stack/Init.hs @@ -421,8 +421,8 @@ renderStackYaml p ignoredPackages dupPackages = , "A snapshot resolver dictates the compiler version and the set of packages" , "to be used for project dependencies. For example:" , "" - , "resolver: lts-20.26" - , "resolver: nightly-2023-08-06" + , "resolver: lts-21.8" + , "resolver: nightly-2023-08-19" , "resolver: ghc-9.6.2" , "" , "The location of a snapshot can be provided as a file or url. Stack assumes" diff --git a/test/integration/lib/StackTest.hs b/test/integration/lib/StackTest.hs index 20218b5d39..be969ad99f 100644 --- a/test/integration/lib/StackTest.hs +++ b/test/integration/lib/StackTest.hs @@ -363,7 +363,7 @@ isMacOSX = os == "darwin" -- the main @stack.yaml@. -- defaultResolverArg :: String -defaultResolverArg = "--resolver=lts-20.26" +defaultResolverArg = "--resolver=lts-21.8" -- | Remove a file and ignore any warnings about missing files. removeFileIgnore :: HasCallStack => FilePath -> IO () diff --git a/test/integration/tests/111-custom-snapshot/files/my-snapshot.yaml b/test/integration/tests/111-custom-snapshot/files/my-snapshot.yaml index 39e7ba947d..5645c5ac56 100644 --- a/test/integration/tests/111-custom-snapshot/files/my-snapshot.yaml +++ b/test/integration/tests/111-custom-snapshot/files/my-snapshot.yaml @@ -1,4 +1,4 @@ -compiler: ghc-9.2.8 +compiler: ghc-9.4.6 name: my-snapshot packages: - mtl-2.2.1 diff --git a/test/integration/tests/1265-extensible-snapshots/Main.hs b/test/integration/tests/1265-extensible-snapshots/Main.hs index 606ea188a7..506ddbd941 100644 --- a/test/integration/tests/1265-extensible-snapshots/Main.hs +++ b/test/integration/tests/1265-extensible-snapshots/Main.hs @@ -6,5 +6,5 @@ main = do stackErr ["build", "zlib-bindings"] stack ["build", "--stack-yaml", "stack-modify-lts.yaml", "async"] stack ["build", "--stack-yaml", "stack-local-snapshot.yaml", "async"] - stack ["build", "--stack-yaml", "stack-remote-snapshot.yaml", "async"] + stack ["build", "--stack-yaml", "stack-remote-snapshot.yaml", "acme-missiles"] stackErr ["build", "--stack-yaml", "stack-modify-lts.yaml", "zlib-bindings"] diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml b/test/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml index 8b4b298e4a..2872c36fb1 100644 --- a/test/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml +++ b/test/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml @@ -1,9 +1,10 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 name: test-snapshot-2 packages: -- stm-2.5.0.0 -- async-2.1.0 -- zlib-0.6.2.1@sha256:201b3f7d4edd0a6a0b235105a4d1aa8d30dcb7c8b4043102487407a4753657ef,4508 +- stm-2.5.1.0 +- async-2.2.4 +- hashable-1.4.2.0 +- zlib-0.6.3.0@sha256:9adce39e4ca0b7a87d45df0a243134816c57059a08e28cff5469c98ae1f54dfc,5367 # FIXME: test these here flags: {} ghc-options: {} diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml b/test/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml index 6d2fd618be..5730336844 100644 --- a/test/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml +++ b/test/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.26 +resolver: lts-21.8 name: snapshot-modify-lts drop-packages: - zlib diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml b/test/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml index 50a9b4a1a7..4fdd036fe4 100644 --- a/test/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml +++ b/test/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml @@ -1,5 +1,5 @@ --- -resolver: lts-20.26 +resolver: lts-21.8 name: local-snapshot packages: - archive: package-0.1.2.3.tar.gz diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml b/test/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml index da5998af47..6c5bed381d 100644 --- a/test/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml +++ b/test/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml @@ -1,5 +1,5 @@ --- -resolver: lts-20.26 +resolver: lts-21.8 name: remote-snapshot packages: -- archive: https://s3.amazonaws.com/hackage.fpcomplete.com/package/ghc-prim-0.8.0.tar.gz +- archive: https://s3.amazonaws.com/hackage.fpcomplete.com/package/acme-missiles-0.3.tar.gz diff --git a/test/integration/tests/1337-unicode-everywhere/files/stack.yaml b/test/integration/tests/1337-unicode-everywhere/files/stack.yaml index 5831cb05ee..e41a1b9910 100644 --- a/test/integration/tests/1337-unicode-everywhere/files/stack.yaml +++ b/test/integration/tests/1337-unicode-everywhere/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.26 +resolver: lts-21.8 packages: - '.' extra-deps: [] diff --git a/test/integration/tests/1438-configure-options/files/stack-everything.yaml b/test/integration/tests/1438-configure-options/files/stack-everything.yaml index 4dc4bb9668..ff54b8a74b 100644 --- a/test/integration/tests/1438-configure-options/files/stack-everything.yaml +++ b/test/integration/tests/1438-configure-options/files/stack-everything.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 extra-deps: - acme-dont-1.1@rev:0 diff --git a/test/integration/tests/1438-configure-options/files/stack-locals.yaml b/test/integration/tests/1438-configure-options/files/stack-locals.yaml index 14ba44261f..82e8ac4a36 100644 --- a/test/integration/tests/1438-configure-options/files/stack-locals.yaml +++ b/test/integration/tests/1438-configure-options/files/stack-locals.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 extra-deps: - acme-dont-1.1@rev:0 diff --git a/test/integration/tests/1438-configure-options/files/stack-name.yaml b/test/integration/tests/1438-configure-options/files/stack-name.yaml index ed28ab680a..3c75094e97 100644 --- a/test/integration/tests/1438-configure-options/files/stack-name.yaml +++ b/test/integration/tests/1438-configure-options/files/stack-name.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 extra-deps: - acme-dont-1.1@rev:0 diff --git a/test/integration/tests/1438-configure-options/files/stack-targets.yaml b/test/integration/tests/1438-configure-options/files/stack-targets.yaml index 4cf7d2bf2a..0eef092c75 100644 --- a/test/integration/tests/1438-configure-options/files/stack-targets.yaml +++ b/test/integration/tests/1438-configure-options/files/stack-targets.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 extra-deps: - acme-dont-1.1@rev:0 diff --git a/test/integration/tests/1659-skip-component/files/stack.yaml b/test/integration/tests/1659-skip-component/files/stack.yaml index 5831cb05ee..e41a1b9910 100644 --- a/test/integration/tests/1659-skip-component/files/stack.yaml +++ b/test/integration/tests/1659-skip-component/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.26 +resolver: lts-21.8 packages: - '.' extra-deps: [] diff --git a/test/integration/tests/1884-url-to-tarball/files/stack.yaml b/test/integration/tests/1884-url-to-tarball/files/stack.yaml index 765fbc1a42..1354617301 100644 --- a/test/integration/tests/1884-url-to-tarball/files/stack.yaml +++ b/test/integration/tests/1884-url-to-tarball/files/stack.yaml @@ -2,4 +2,4 @@ extra-deps: - location: https://hackage.haskell.org/package/half-0.2.2.3/half-0.2.2.3.tar.gz sha256: 85c244c80d1c889a3d79073a6f5a99d9e769dbe3c574ca11d992b2b4f7599a5c size: 6050 -resolver: lts-20.26 +resolver: lts-21.8 diff --git a/test/integration/tests/2195-depend-on-exe/files/stack.yaml b/test/integration/tests/2195-depend-on-exe/files/stack.yaml index fc9172fa2f..7bb6ef2774 100644 --- a/test/integration/tests/2195-depend-on-exe/files/stack.yaml +++ b/test/integration/tests/2195-depend-on-exe/files/stack.yaml @@ -1 +1 @@ -resolver: lts-20.26 +resolver: lts-21.8 diff --git a/test/integration/tests/2433-ghc-by-version/files/run.sh b/test/integration/tests/2433-ghc-by-version/files/run.sh index 368dc50073..8b04db9a3e 100755 --- a/test/integration/tests/2433-ghc-by-version/files/run.sh +++ b/test/integration/tests/2433-ghc-by-version/files/run.sh @@ -2,10 +2,10 @@ set -exuo pipefail -export PATH=$(pwd)/fake-path:$("$STACK_EXE" path --resolver ghc-9.2.8 --compiler-bin):$PATH +export PATH=$(pwd)/fake-path:$("$STACK_EXE" path --resolver ghc-9.4.6 --compiler-bin):$PATH export STACK_ROOT=$(pwd)/fake-root which ghc -"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.2.8 ghc -- --info -"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.2.8 runghc foo.hs +"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.4.6 ghc -- --info +"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.4.6 runghc foo.hs diff --git a/test/integration/tests/2781-shadow-bug/files/stack.yaml b/test/integration/tests/2781-shadow-bug/files/stack.yaml index 8373d1e946..54737dd345 100644 --- a/test/integration/tests/2781-shadow-bug/files/stack.yaml +++ b/test/integration/tests/2781-shadow-bug/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 packages: - foo - bar diff --git a/test/integration/tests/2997-ensure-warnings-output/files/stack.yaml b/test/integration/tests/2997-ensure-warnings-output/files/stack.yaml index f724a1652d..6b7c7e05f8 100644 --- a/test/integration/tests/2997-ensure-warnings-output/files/stack.yaml +++ b/test/integration/tests/2997-ensure-warnings-output/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 packages: - foo - bar diff --git a/test/integration/tests/32-unlisted-module/files/stack.yaml b/test/integration/tests/32-unlisted-module/files/stack.yaml index 42d4ec589c..d39c915183 100644 --- a/test/integration/tests/32-unlisted-module/files/stack.yaml +++ b/test/integration/tests/32-unlisted-module/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-20.26 +resolver: lts-21.8 diff --git a/test/integration/tests/3315-multi-ghc-options/files/stack.yaml b/test/integration/tests/3315-multi-ghc-options/files/stack.yaml index 7100eeeb15..27c4447c7f 100644 --- a/test/integration/tests/3315-multi-ghc-options/files/stack.yaml +++ b/test/integration/tests/3315-multi-ghc-options/files/stack.yaml @@ -1,3 +1,3 @@ -resolver: lts-20.26 +resolver: lts-21.8 packages: - '.' diff --git a/test/integration/tests/335-multi-package-flags/files/stack.yaml b/test/integration/tests/335-multi-package-flags/files/stack.yaml index 42d4ec589c..d39c915183 100644 --- a/test/integration/tests/335-multi-package-flags/files/stack.yaml +++ b/test/integration/tests/335-multi-package-flags/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-20.26 +resolver: lts-21.8 diff --git a/test/integration/tests/3390-unbuildable-test/files/stack.yaml b/test/integration/tests/3390-unbuildable-test/files/stack.yaml index 4324da7693..b76322c7a4 100644 --- a/test/integration/tests/3390-unbuildable-test/files/stack.yaml +++ b/test/integration/tests/3390-unbuildable-test/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 diff --git a/test/integration/tests/3396-package-indices/files/my-snapshot.yaml b/test/integration/tests/3396-package-indices/files/my-snapshot.yaml index a7feaca2cc..482f7aa6fb 100644 --- a/test/integration/tests/3396-package-indices/files/my-snapshot.yaml +++ b/test/integration/tests/3396-package-indices/files/my-snapshot.yaml @@ -1,4 +1,4 @@ -compiler: ghc-9.2.8 +compiler: ghc-9.4.6 name: my-snapshot packages: diff --git a/test/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml b/test/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml index 8b0f692a3c..20823176c7 100644 --- a/test/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml +++ b/test/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 name: custom1 packages: - stm-2.5.0.0 diff --git a/test/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml b/test/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml index 94760648a8..63f6ce369a 100644 --- a/test/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml +++ b/test/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 name: custom2 packages: - stm-2.5.0.0 diff --git a/test/integration/tests/345-override-bytestring/files/stack.yaml b/test/integration/tests/345-override-bytestring/files/stack.yaml index 75a0e1016d..539dcf714f 100644 --- a/test/integration/tests/345-override-bytestring/files/stack.yaml +++ b/test/integration/tests/345-override-bytestring/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.26 +resolver: lts-21.8 extra-deps: - bytestring-0.11.3.1 - binary-0.8.9.0 diff --git a/test/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml b/test/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml index 4c40fd27c7..22bc203b81 100644 --- a/test/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml +++ b/test/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.26 +resolver: lts-21.8 packages: - ./local-mmorph diff --git a/test/integration/tests/3574-extra-dep-local/files/stack.yaml b/test/integration/tests/3574-extra-dep-local/files/stack.yaml index c14bfffe94..3e2a2b65dd 100644 --- a/test/integration/tests/3574-extra-dep-local/files/stack.yaml +++ b/test/integration/tests/3574-extra-dep-local/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 packages: [] diff --git a/test/integration/tests/3591-cabal-warnings-once/files/stack.yaml b/test/integration/tests/3591-cabal-warnings-once/files/stack.yaml index fc9172fa2f..7bb6ef2774 100644 --- a/test/integration/tests/3591-cabal-warnings-once/files/stack.yaml +++ b/test/integration/tests/3591-cabal-warnings-once/files/stack.yaml @@ -1 +1 @@ -resolver: lts-20.26 +resolver: lts-21.8 diff --git a/test/integration/tests/365-invalid-success/files/stack.yaml b/test/integration/tests/365-invalid-success/files/stack.yaml index 42d4ec589c..d39c915183 100644 --- a/test/integration/tests/365-invalid-success/files/stack.yaml +++ b/test/integration/tests/365-invalid-success/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-20.26 +resolver: lts-21.8 diff --git a/test/integration/tests/366-non-root-dir/files/stack.yaml b/test/integration/tests/366-non-root-dir/files/stack.yaml index 42d4ec589c..d39c915183 100644 --- a/test/integration/tests/366-non-root-dir/files/stack.yaml +++ b/test/integration/tests/366-non-root-dir/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-20.26 +resolver: lts-21.8 diff --git a/test/integration/tests/370-invalid-setup-hs/files/stack.yaml b/test/integration/tests/370-invalid-setup-hs/files/stack.yaml index 4324da7693..b76322c7a4 100644 --- a/test/integration/tests/370-invalid-setup-hs/files/stack.yaml +++ b/test/integration/tests/370-invalid-setup-hs/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 diff --git a/test/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml b/test/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml index fc9172fa2f..7bb6ef2774 100644 --- a/test/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml +++ b/test/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml @@ -1 +1 @@ -resolver: lts-20.26 +resolver: lts-21.8 diff --git a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml b/test/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml index 5bb8bb5528..6908b6d438 100644 --- a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml +++ b/test/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 packages: - ./bad-bounds.tar diff --git a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml b/test/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml index e1d9f3c613..89cd70e2bc 100644 --- a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml +++ b/test/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 extra-deps: - ./bad-bounds.tar diff --git a/test/integration/tests/3863-purge-command/files/stack.yaml b/test/integration/tests/3863-purge-command/files/stack.yaml index 42d4ec589c..d39c915183 100644 --- a/test/integration/tests/3863-purge-command/files/stack.yaml +++ b/test/integration/tests/3863-purge-command/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-20.26 +resolver: lts-21.8 diff --git a/test/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml b/test/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml index 872947457a..18fd05c28b 100644 --- a/test/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml +++ b/test/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 extra-deps: - stm-2.4.4.1 - mtl-2.2.1 diff --git a/test/integration/tests/3926-ghci-with-sublibraries/files/files.cabal b/test/integration/tests/3926-ghci-with-sublibraries/files/files.cabal index 867797cb7b..c661c0e007 100644 --- a/test/integration/tests/3926-ghci-with-sublibraries/files/files.cabal +++ b/test/integration/tests/3926-ghci-with-sublibraries/files/files.cabal @@ -1,7 +1,8 @@ +cabal-version: 2.0 + name: files version: 0.1.0.0 build-type: Simple -cabal-version: >= 2.0 library hs-source-dirs: src diff --git a/test/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml b/test/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml index 872947457a..247259fe3b 100644 --- a/test/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml +++ b/test/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 extra-deps: -- stm-2.4.4.1 -- mtl-2.2.1 +- stm-2.5.1.0 +- mtl-2.2.2 diff --git a/test/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml b/test/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml index f1f47b5985..e651424386 100644 --- a/test/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml +++ b/test/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml @@ -1,3 +1,3 @@ -resolver: lts-20.26 +resolver: lts-21.8 extra-deps: - base-4.10.1.0 diff --git a/test/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml b/test/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml index fc9172fa2f..7bb6ef2774 100644 --- a/test/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml +++ b/test/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml @@ -1 +1 @@ -resolver: lts-20.26 +resolver: lts-21.8 diff --git a/test/integration/tests/3942-solver-error-output/files/test-stack.yml b/test/integration/tests/3942-solver-error-output/files/test-stack.yml index 748bc93db2..15716e973b 100644 --- a/test/integration/tests/3942-solver-error-output/files/test-stack.yml +++ b/test/integration/tests/3942-solver-error-output/files/test-stack.yml @@ -1,4 +1,4 @@ -resolver: lts-20.26 +resolver: lts-21.8 packages: [] diff --git a/test/integration/tests/3959-order-of-flags/files/stack.yaml b/test/integration/tests/3959-order-of-flags/files/stack.yaml index fc9172fa2f..7bb6ef2774 100644 --- a/test/integration/tests/3959-order-of-flags/files/stack.yaml +++ b/test/integration/tests/3959-order-of-flags/files/stack.yaml @@ -1 +1 @@ -resolver: lts-20.26 +resolver: lts-21.8 diff --git a/test/integration/tests/397-case-insensitive-flags/files/stack.yaml b/test/integration/tests/397-case-insensitive-flags/files/stack.yaml index fc9172fa2f..7bb6ef2774 100644 --- a/test/integration/tests/397-case-insensitive-flags/files/stack.yaml +++ b/test/integration/tests/397-case-insensitive-flags/files/stack.yaml @@ -1 +1 @@ -resolver: lts-20.26 +resolver: lts-21.8 diff --git a/test/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml b/test/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml index 872947457a..18fd05c28b 100644 --- a/test/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml +++ b/test/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 extra-deps: - stm-2.4.4.1 - mtl-2.2.1 diff --git a/test/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml b/test/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml index fc9172fa2f..7bb6ef2774 100644 --- a/test/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml +++ b/test/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml @@ -1 +1 @@ -resolver: lts-20.26 +resolver: lts-21.8 diff --git a/test/integration/tests/4001-excess-recompilation/files/stack.yaml b/test/integration/tests/4001-excess-recompilation/files/stack.yaml index 4324da7693..b76322c7a4 100644 --- a/test/integration/tests/4001-excess-recompilation/files/stack.yaml +++ b/test/integration/tests/4001-excess-recompilation/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 diff --git a/test/integration/tests/4044-no-run-tests-config/files/stack.yaml b/test/integration/tests/4044-no-run-tests-config/files/stack.yaml index d6284748a7..e26eeee4eb 100644 --- a/test/integration/tests/4044-no-run-tests-config/files/stack.yaml +++ b/test/integration/tests/4044-no-run-tests-config/files/stack.yaml @@ -1,4 +1,4 @@ build: test-arguments: no-run-tests: true -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 diff --git a/test/integration/tests/4095-utf8-pure-nix/files/stack.yaml b/test/integration/tests/4095-utf8-pure-nix/files/stack.yaml index fc9172fa2f..46f5de0d20 100644 --- a/test/integration/tests/4095-utf8-pure-nix/files/stack.yaml +++ b/test/integration/tests/4095-utf8-pure-nix/files/stack.yaml @@ -1 +1,4 @@ -resolver: lts-20.26 +# As of 20 August 2023, there is no Nix package haskell.compiler.ghc946. +# Available options include ghc92 (GHC 9.2.8), ghc926, ghc927, +# ghc94 (GHC 9.4.5), ghc942, ghc943 or ghc944. +resolver: lts-20.26 # GHC 9.2.8 diff --git a/test/integration/tests/4101-dependency-tree/Main.hs b/test/integration/tests/4101-dependency-tree/Main.hs index dc1e2f000b..9dafcf990b 100644 --- a/test/integration/tests/4101-dependency-tree/Main.hs +++ b/test/integration/tests/4101-dependency-tree/Main.hs @@ -12,7 +12,7 @@ main = stackCheckStdout ["ls", "dependencies", "tree"] $ \stdOut -> do let expected = unlines [ "Packages" , "├─┬ files 0.1.0.0" - , "│ ├─┬ base 4.16.4.0" + , "│ ├─┬ base 4.17.2.0" ] unless (expected `isPrefixOf` stdOut) $ error $ unlines [ "Expected:", expected, "Actual:", stdOut ] @@ -20,12 +20,12 @@ main = stackCheckStdout ["ls", "dependencies", "tree", "--depth=1"] $ \stdOut -> do let expected = unlines [ "Packages" , "├─┬ files 0.1.0.0" - , "│ ├── base 4.16.4.0" + , "│ ├── base 4.17.2.0" , "│ ├── filelock 0.1.1.2" , "│ ├── mtl 2.2.2" , "│ └── subproject 0.1.0.0" , "└─┬ subproject 0.1.0.0" - , " └── base 4.16.4.0" + , " └── base 4.17.2.0" ] when (stdOut /= expected) $ error $ unlines [ "Expected:", expected, "Actual:", stdOut ] @@ -33,13 +33,13 @@ main = stackCheckStdout ["ls", "dependencies", "tree", "subproject"] $ \stdOut -> do let expected = unlines [ "Packages" , "└─┬ subproject 0.1.0.0" - , " └─┬ base 4.16.4.0" - ," ├─┬ ghc-bignum 1.2" - ," │ └─┬ ghc-prim 0.8.0" - ," │ └── rts 1.0.2" - ," ├─┬ ghc-prim 0.8.0" - ," │ └── rts 1.0.2" - ," └── rts 1.0.2" + , " └─┬ base 4.17.2.0" + , " ├─┬ ghc-bignum 1.3" + , " │ └─┬ ghc-prim 0.9.1" + , " │ └── rts 1.0.2" + , " ├─┬ ghc-prim 0.9.1" + , " │ └── rts 1.0.2" + , " └── rts 1.0.2" ] when (stdOut /= expected) $ error $ unlines [ "Expected:", expected, "Actual:", stdOut ] diff --git a/test/integration/tests/4101-dependency-tree/files/stack.yaml b/test/integration/tests/4101-dependency-tree/files/stack.yaml index 9aaa8b1e50..d2dffc79c8 100644 --- a/test/integration/tests/4101-dependency-tree/files/stack.yaml +++ b/test/integration/tests/4101-dependency-tree/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.26 +resolver: lts-21.8 packages: - . - subproject diff --git a/test/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml b/test/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml index fc9172fa2f..7bb6ef2774 100644 --- a/test/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml +++ b/test/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml @@ -1 +1 @@ -resolver: lts-20.26 +resolver: lts-21.8 diff --git a/test/integration/tests/4215-missing-unregister/files/stack1.yaml b/test/integration/tests/4215-missing-unregister/files/stack1.yaml index 83fadb8d3c..b4ad5143e7 100644 --- a/test/integration/tests/4215-missing-unregister/files/stack1.yaml +++ b/test/integration/tests/4215-missing-unregister/files/stack1.yaml @@ -1,3 +1,3 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 packages: - v1 diff --git a/test/integration/tests/4215-missing-unregister/files/stack2.yaml b/test/integration/tests/4215-missing-unregister/files/stack2.yaml index e741fce22b..f06566a0e5 100644 --- a/test/integration/tests/4215-missing-unregister/files/stack2.yaml +++ b/test/integration/tests/4215-missing-unregister/files/stack2.yaml @@ -1,3 +1,3 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 packages: - v2 diff --git a/test/integration/tests/4270-files-order/files/stack.yaml b/test/integration/tests/4270-files-order/files/stack.yaml index 52479c960e..8e0de7de0e 100644 --- a/test/integration/tests/4270-files-order/files/stack.yaml +++ b/test/integration/tests/4270-files-order/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.26 +resolver: lts-21.8 packages: - . diff --git a/test/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml b/test/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml index 4324da7693..b76322c7a4 100644 --- a/test/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml +++ b/test/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 diff --git a/test/integration/tests/4390-dot-no-ghc/files/stack.yaml b/test/integration/tests/4390-dot-no-ghc/files/stack.yaml index 4324da7693..b76322c7a4 100644 --- a/test/integration/tests/4390-dot-no-ghc/files/stack.yaml +++ b/test/integration/tests/4390-dot-no-ghc/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 diff --git a/test/integration/tests/4453-detailed/files/stack.yaml b/test/integration/tests/4453-detailed/files/stack.yaml index 7100eeeb15..27c4447c7f 100644 --- a/test/integration/tests/4453-detailed/files/stack.yaml +++ b/test/integration/tests/4453-detailed/files/stack.yaml @@ -1,3 +1,3 @@ -resolver: lts-20.26 +resolver: lts-21.8 packages: - '.' diff --git a/test/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml b/test/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml index 4324da7693..b76322c7a4 100644 --- a/test/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml +++ b/test/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml @@ -1 +1 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 diff --git a/test/integration/tests/4488-newer-cabal-version/files/stack-good.yaml b/test/integration/tests/4488-newer-cabal-version/files/stack-good.yaml index ddc521c7aa..143aa96a52 100644 --- a/test/integration/tests/4488-newer-cabal-version/files/stack-good.yaml +++ b/test/integration/tests/4488-newer-cabal-version/files/stack-good.yaml @@ -1,3 +1,3 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 extra-deps: - Cabal-2.4.1.0 diff --git a/test/integration/tests/4754-rebuild-haddocks/files/stack.yaml b/test/integration/tests/4754-rebuild-haddocks/files/stack.yaml index 4324da7693..b76322c7a4 100644 --- a/test/integration/tests/4754-rebuild-haddocks/files/stack.yaml +++ b/test/integration/tests/4754-rebuild-haddocks/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 diff --git a/test/integration/tests/4783-doctest-deps/files/snapshot.yaml b/test/integration/tests/4783-doctest-deps/files/snapshot.yaml index 021f71e4b7..71e5252a8c 100644 --- a/test/integration/tests/4783-doctest-deps/files/snapshot.yaml +++ b/test/integration/tests/4783-doctest-deps/files/snapshot.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.26 +resolver: lts-21.8 name: foo packages: - acme-dont-1.1@sha256:8264ad3e5113d3e0417b46e71d5a9c0914a1f03b5b81319cc329f1dc0f49b96c,602 diff --git a/test/integration/tests/4897-boot-package-pruned/files/stack.yaml b/test/integration/tests/4897-boot-package-pruned/files/stack.yaml index 89ce69d9f5..7e99888ed1 100644 --- a/test/integration/tests/4897-boot-package-pruned/files/stack.yaml +++ b/test/integration/tests/4897-boot-package-pruned/files/stack.yaml @@ -1,3 +1,3 @@ -resolver: lts-20.26 +resolver: lts-21.8 packages: [.] extra-deps: [./directory] diff --git a/test/integration/tests/4938-non-ascii-module-names/files/stack.yaml b/test/integration/tests/4938-non-ascii-module-names/files/stack.yaml index fc9172fa2f..7bb6ef2774 100644 --- a/test/integration/tests/4938-non-ascii-module-names/files/stack.yaml +++ b/test/integration/tests/4938-non-ascii-module-names/files/stack.yaml @@ -1 +1 @@ -resolver: lts-20.26 +resolver: lts-21.8 diff --git a/test/integration/tests/5180-ghc-rts-flags/files/stack.yaml b/test/integration/tests/5180-ghc-rts-flags/files/stack.yaml index 0c8db92a14..f4ec037ec5 100644 --- a/test/integration/tests/5180-ghc-rts-flags/files/stack.yaml +++ b/test/integration/tests/5180-ghc-rts-flags/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.26 +resolver: lts-21.8 packages: - . diff --git a/test/integration/tests/5272-only-locals/files/stack.yaml b/test/integration/tests/5272-only-locals/files/stack.yaml index cf530135fb..6d5c8c19db 100644 --- a/test/integration/tests/5272-only-locals/files/stack.yaml +++ b/test/integration/tests/5272-only-locals/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 extra-deps: - unliftio-core-0.2.0.1@sha256:f9abcdd3f3d28e4840563efb7b8760d2de9b5707bcd6f53a87f6a0d77bb5a9f7,1082 # Force a unique snapshot diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml b/test/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml index c644f40376..10b5fa2b26 100644 --- a/test/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml +++ b/test/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.26 +resolver: lts-21.8 packages: - . - ../package-c diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml b/test/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml index c644f40376..10b5fa2b26 100644 --- a/test/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml +++ b/test/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.26 +resolver: lts-21.8 packages: - . - ../package-c diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml b/test/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml index 1f407f6f5a..bbdc28be66 100644 --- a/test/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml +++ b/test/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml @@ -1,3 +1,3 @@ -resolver: lts-20.26 +resolver: lts-21.8 packages: - . diff --git a/test/integration/tests/6046-missing-sublib-unregister/files/stack.yaml b/test/integration/tests/6046-missing-sublib-unregister/files/stack.yaml index fc9172fa2f..7bb6ef2774 100644 --- a/test/integration/tests/6046-missing-sublib-unregister/files/stack.yaml +++ b/test/integration/tests/6046-missing-sublib-unregister/files/stack.yaml @@ -1 +1 @@ -resolver: lts-20.26 +resolver: lts-21.8 diff --git a/test/integration/tests/606-local-version-not-exist/files/stack.yaml b/test/integration/tests/606-local-version-not-exist/files/stack.yaml index 42d4ec589c..d39c915183 100644 --- a/test/integration/tests/606-local-version-not-exist/files/stack.yaml +++ b/test/integration/tests/606-local-version-not-exist/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-20.26 +resolver: lts-21.8 diff --git a/test/integration/tests/617-extra-dep-flag/files/stack.yaml b/test/integration/tests/617-extra-dep-flag/files/stack.yaml index 8eae22b03b..4c5203b8cf 100644 --- a/test/integration/tests/617-extra-dep-flag/files/stack.yaml +++ b/test/integration/tests/617-extra-dep-flag/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 flags: text: integer-simple: false diff --git a/test/integration/tests/617-unused-flag-cli/files/stack.yaml b/test/integration/tests/617-unused-flag-cli/files/stack.yaml index 4324da7693..b76322c7a4 100644 --- a/test/integration/tests/617-unused-flag-cli/files/stack.yaml +++ b/test/integration/tests/617-unused-flag-cli/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 diff --git a/test/integration/tests/617-unused-flag-name-yaml/files/stack.yaml b/test/integration/tests/617-unused-flag-name-yaml/files/stack.yaml index 065da38360..072820694c 100644 --- a/test/integration/tests/617-unused-flag-name-yaml/files/stack.yaml +++ b/test/integration/tests/617-unused-flag-name-yaml/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 flags: files: does-not-exist: false diff --git a/test/integration/tests/617-unused-flag-yaml/files/stack.yaml b/test/integration/tests/617-unused-flag-yaml/files/stack.yaml index 69b32e166b..9f1b3810bd 100644 --- a/test/integration/tests/617-unused-flag-yaml/files/stack.yaml +++ b/test/integration/tests/617-unused-flag-yaml/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 flags: does-not-exist: foo: false diff --git a/test/integration/tests/620-env-command/files/run.sh b/test/integration/tests/620-env-command/files/run.sh index f89ad2e294..3c6011e0e3 100644 --- a/test/integration/tests/620-env-command/files/run.sh +++ b/test/integration/tests/620-env-command/files/run.sh @@ -2,6 +2,6 @@ set -euxo pipefail -stack build --resolver lts-20.26 async -eval `stack config env --resolver lts-20.26` +stack build --resolver lts-21.8 async +eval `stack config env --resolver lts-21.8` ghc Main.hs diff --git a/test/integration/tests/717-sdist-test/files/stack.yaml b/test/integration/tests/717-sdist-test/files/stack.yaml index f3c6d4a1a4..810cef02ed 100644 --- a/test/integration/tests/717-sdist-test/files/stack.yaml +++ b/test/integration/tests/717-sdist-test/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.26 +resolver: lts-21.8 packages: - package-with-th - package-with-working-th diff --git a/test/integration/tests/763-buildable-false/files/stack.yaml b/test/integration/tests/763-buildable-false/files/stack.yaml index 42d4ec589c..d39c915183 100644 --- a/test/integration/tests/763-buildable-false/files/stack.yaml +++ b/test/integration/tests/763-buildable-false/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-20.26 +resolver: lts-21.8 diff --git a/test/integration/tests/796-ghc-options/files/stack.yaml b/test/integration/tests/796-ghc-options/files/stack.yaml index 68b2ef8ac5..266b73b97e 100644 --- a/test/integration/tests/796-ghc-options/files/stack.yaml +++ b/test/integration/tests/796-ghc-options/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 ghc-options: "*": -DFOO ghc-options: -DBAR diff --git a/test/integration/tests/allow-newer-specific-packages/files/stack.yaml b/test/integration/tests/allow-newer-specific-packages/files/stack.yaml index 59a0245ec3..6d8afaa618 100644 --- a/test/integration/tests/allow-newer-specific-packages/files/stack.yaml +++ b/test/integration/tests/allow-newer-specific-packages/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.26 +resolver: lts-21.8 allow-newer: true allow-newer-deps: diff --git a/test/integration/tests/cabal-non-buildable-bug/Main.hs b/test/integration/tests/cabal-non-buildable-bug/Main.hs index 22d922bf7f..5407d5cf93 100644 --- a/test/integration/tests/cabal-non-buildable-bug/Main.hs +++ b/test/integration/tests/cabal-non-buildable-bug/Main.hs @@ -4,7 +4,7 @@ main :: IO () main = do -- Newer Cabal: dry run and building should succeed, because they'll -- both ignore the do-not-build - writeFile "stack.yaml" "resolver: ghc-9.2.8" + writeFile "stack.yaml" "resolver: lts-21.8" stack ["build", "--dry-run"] stack ["build"] @@ -14,5 +14,7 @@ main = do -- and build will fail (because Cabal will be using its broken -- logic). writeFile "stack.yaml" "resolver: ghc-7.10.3" - stackErr ["build"] - stackErr ["build", "--dry-run"] + -- The '--install-ghc' flag is passed here, because IntegrationSpec.runApp + -- sets up `config.yaml` with `system-ghc: true` and `install-ghc: false`. + stackErr ["--install-ghc", "build"] + stackErr ["--install-ghc", "build", "--dry-run"] diff --git a/test/integration/tests/cabal-sublibrary-dependency/Main.hs b/test/integration/tests/cabal-sublibrary-dependency/Main.hs index 8208eef49f..28e1951aca 100644 --- a/test/integration/tests/cabal-sublibrary-dependency/Main.hs +++ b/test/integration/tests/cabal-sublibrary-dependency/Main.hs @@ -7,10 +7,10 @@ import StackTest -- sub, each of which exposes a module that exports a function. main :: IO () --- The '--install-ghc' flag is passed here, because etc/scripts/release.hs --- passes `--no-install-ghc` when `--alpine` is passed to its 'check' command. --- (See stack.yaml; using GHC 9.4.4.) -main = stackErrStderr ["build", "--install-ghc"] $ \str -> +-- The '--install-ghc' flag is passed here, because IntegrationSpec.runApp sets +-- up `config.yaml` with `system-ghc: true` and `install-ghc: false`. +-- (See stack.yaml; using GHC 9.4.6.) +main = stackErrStderr ["--install-ghc", "build"] $ \str -> let msg = "Sublibrary dependency is not supported, this will almost \ \certainly fail." in unless (msg `isInfixOf` str) $ diff --git a/test/integration/tests/cabal-sublibrary-dependency/files/stack.yaml b/test/integration/tests/cabal-sublibrary-dependency/files/stack.yaml index 897f17b2e4..6a9ce28ac5 100644 --- a/test/integration/tests/cabal-sublibrary-dependency/files/stack.yaml +++ b/test/integration/tests/cabal-sublibrary-dependency/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: nightly-2023-05-26 # GHC 9.4.5 +resolver: lts-21.8 # GHC 9.4.6 packages: - . - subproject diff --git a/test/integration/tests/copy-bins-works/files/stack.yaml b/test/integration/tests/copy-bins-works/files/stack.yaml index 5c34ca3d10..0d3bd472db 100644 --- a/test/integration/tests/copy-bins-works/files/stack.yaml +++ b/test/integration/tests/copy-bins-works/files/stack.yaml @@ -1,2 +1,2 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 copy-bins: true diff --git a/test/integration/tests/cyclic-test-deps/Main.hs b/test/integration/tests/cyclic-test-deps/Main.hs index 3635b01c36..588435ad5e 100644 --- a/test/integration/tests/cyclic-test-deps/Main.hs +++ b/test/integration/tests/cyclic-test-deps/Main.hs @@ -2,9 +2,9 @@ import StackTest main :: IO () main = do - removeDirIgnore "text-2.0" - stack ["unpack", "text-2.0"] - stack ["unpack", "QuickCheck-2.14.2"] + removeDirIgnore "text-2.0.2" + stack ["unpack", "text-2.0.2"] + stack ["unpack", "QuickCheck-2.14.3"] removeFileIgnore "stack.yaml" stack ["init", defaultResolverArg] stack ["test", "--dry-run"] diff --git a/test/integration/tests/drop-packages/files/stack.yaml b/test/integration/tests/drop-packages/files/stack.yaml index d7c1c091bf..6fdcec4828 100644 --- a/test/integration/tests/drop-packages/files/stack.yaml +++ b/test/integration/tests/drop-packages/files/stack.yaml @@ -1,3 +1,3 @@ -resolver: lts-20.26 +resolver: lts-21.8 drop-packages: - unliftio-core diff --git a/test/integration/tests/duplicate-package-ids/files/stack1.yaml b/test/integration/tests/duplicate-package-ids/files/stack1.yaml index 518cb6ff68..b4b0f3102b 100644 --- a/test/integration/tests/duplicate-package-ids/files/stack1.yaml +++ b/test/integration/tests/duplicate-package-ids/files/stack1.yaml @@ -1,2 +1,2 @@ -resolver: lts-20.26 +resolver: lts-21.8 packages: [] diff --git a/test/integration/tests/duplicate-package-ids/files/stack2.yaml b/test/integration/tests/duplicate-package-ids/files/stack2.yaml index 9171955713..0ba5adf277 100644 --- a/test/integration/tests/duplicate-package-ids/files/stack2.yaml +++ b/test/integration/tests/duplicate-package-ids/files/stack2.yaml @@ -1,3 +1,3 @@ -resolver: lts-20.26 +resolver: lts-21.8 packages: - auto-update-0.1.2.1 diff --git a/test/integration/tests/ghc-install-hooks/files/run.sh b/test/integration/tests/ghc-install-hooks/files/run.sh index 669f2faed8..e615a3988d 100755 --- a/test/integration/tests/ghc-install-hooks/files/run.sh +++ b/test/integration/tests/ghc-install-hooks/files/run.sh @@ -2,7 +2,7 @@ set -exu -stack_bin=$("$STACK_EXE" path --resolver ghc-9.2.8 --compiler-bin) +stack_bin=$("$STACK_EXE" path --resolver ghc-9.4.6 --compiler-bin) export STACK_ROOT=$(pwd)/fake-root @@ -11,5 +11,5 @@ mkdir -p "${STACK_ROOT}"/hooks echo "echo '${stack_bin}/ghc'" > "${STACK_ROOT}"/hooks/ghc-install.sh chmod +x "${STACK_ROOT}"/hooks/ghc-install.sh -"$STACK_EXE" --no-install-ghc --resolver ghc-9.2.8 ghc -- --info -"$STACK_EXE" --no-install-ghc --resolver ghc-9.2.8 runghc foo.hs +"$STACK_EXE" --no-install-ghc --resolver ghc-9.4.6 ghc -- --info +"$STACK_EXE" --no-install-ghc --resolver ghc-9.4.6 runghc foo.hs diff --git a/test/integration/tests/haddock-options/files/stack.yaml b/test/integration/tests/haddock-options/files/stack.yaml index f73ad276ba..57a73a1cc6 100644 --- a/test/integration/tests/haddock-options/files/stack.yaml +++ b/test/integration/tests/haddock-options/files/stack.yaml @@ -2,7 +2,7 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-20.26 +resolver: lts-21.8 build: haddock-arguments: haddock-args: diff --git a/test/integration/tests/hpack-repo/files/stack.yaml b/test/integration/tests/hpack-repo/files/stack.yaml index e9f15bf504..934969e244 100644 --- a/test/integration/tests/hpack-repo/files/stack.yaml +++ b/test/integration/tests/hpack-repo/files/stack.yaml @@ -1,6 +1,6 @@ packages: - . -resolver: lts-20.26 +resolver: lts-21.8 extra-deps: - git: https://github.com/NorfairKing/validity.git commit: d128cc30bc886e31ea7f8161fb7708c08b162937 diff --git a/test/integration/tests/init-omit-packages/Main.hs b/test/integration/tests/init-omit-packages/Main.hs index 52aec4a43f..f3e8b42bf3 100644 --- a/test/integration/tests/init-omit-packages/Main.hs +++ b/test/integration/tests/init-omit-packages/Main.hs @@ -5,8 +5,8 @@ import System.IO (readFile) main :: IO () main = do removeFileIgnore "stack.yaml" - stackErr ["init", "--resolver", "lts-20.26"] - stack ["init", "--resolver", "lts-20.26", "--omit-packages"] + stackErr ["init", "--resolver", "lts-21.8"] + stack ["init", "--resolver", "lts-21.8", "--omit-packages"] contents <- lines <$> readFile "stack.yaml" unless ("#- bad" `elem` contents) $ error "commented out 'bad' package was expected" diff --git a/test/integration/tests/internal-libraries/Main.hs b/test/integration/tests/internal-libraries/Main.hs index 07a2847b36..9062b77d1e 100644 --- a/test/integration/tests/internal-libraries/Main.hs +++ b/test/integration/tests/internal-libraries/Main.hs @@ -2,8 +2,7 @@ import StackTest main :: IO () main = do - -- The '--install-ghc' flag is passed here, because etc/scripts/release.hs - -- passes `--no-install-ghc` when `--alpine` is passed to its 'check' - -- command. - stack ["--install-ghc", "setup"] -- See stack.yaml; using GHC 9.4.5 + -- The '--install-ghc' flag is passed here, because IntegrationSpec.runApp + -- sets up `config.yaml` with `system-ghc: true` and `install-ghc: false`. + stack ["--install-ghc", "setup"] -- See stack.yaml; using GHC 9.4.6 stack ["build"] diff --git a/test/integration/tests/lock-files/files/stack-1-extra b/test/integration/tests/lock-files/files/stack-1-extra index a8df7eacb7..8c12642158 100644 --- a/test/integration/tests/lock-files/files/stack-1-extra +++ b/test/integration/tests/lock-files/files/stack-1-extra @@ -1,3 +1,3 @@ -resolver: lts-20.26 +resolver: lts-21.8 extra-deps: - acme-cuteboy-0.1.0.0 diff --git a/test/integration/tests/lock-files/files/stack-2-extras b/test/integration/tests/lock-files/files/stack-2-extras index f2ca3a6dfa..9f2ae40408 100644 --- a/test/integration/tests/lock-files/files/stack-2-extras +++ b/test/integration/tests/lock-files/files/stack-2-extras @@ -1,4 +1,4 @@ -resolver: lts-20.26 +resolver: lts-21.8 extra-deps: - acme-cuteboy-0.1.0.0 - acme-dont-1.1 diff --git a/test/integration/tests/module-added-multiple-times/files/stack.yaml b/test/integration/tests/module-added-multiple-times/files/stack.yaml index d29f064b80..9d7fde6734 100644 --- a/test/integration/tests/module-added-multiple-times/files/stack.yaml +++ b/test/integration/tests/module-added-multiple-times/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.26 +resolver: lts-21.8 extra-deps: [] flags: {} extra-package-dbs: [] diff --git a/test/integration/tests/multi-test/files/stack.yaml b/test/integration/tests/multi-test/files/stack.yaml index c78875a2c0..db934de8a3 100644 --- a/test/integration/tests/multi-test/files/stack.yaml +++ b/test/integration/tests/multi-test/files/stack.yaml @@ -4,4 +4,4 @@ packages: - sub-package - cyclic extra-deps: [] -resolver: lts-20.26 +resolver: lts-21.8 diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/filepath.cabal b/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/filepath.cabal index 8bec4f9a78..96570d24b8 100644 --- a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/filepath.cabal +++ b/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/filepath.cabal @@ -49,7 +49,7 @@ library System.FilePath.Windows build-depends: - base >= 4.9 && < 4.17 + base >= 4.9 && < 4.18 ghc-options: -Wall diff --git a/test/integration/tests/mutable-deps/files/stack.yaml b/test/integration/tests/mutable-deps/files/stack.yaml index 706e8ba584..d7866f9486 100644 --- a/test/integration/tests/mutable-deps/files/stack.yaml +++ b/test/integration/tests/mutable-deps/files/stack.yaml @@ -1,6 +1,6 @@ -resolver: lts-20.26 +resolver: lts-21.8 packages: - . extra-deps: - ./filepath-1.4.2.2 -- directory-1.3.6.2 +- directory-1.3.7.1 diff --git a/test/integration/tests/nice-resolver-names/Main.hs b/test/integration/tests/nice-resolver-names/Main.hs index fa606f2066..55e4114d59 100644 --- a/test/integration/tests/nice-resolver-names/Main.hs +++ b/test/integration/tests/nice-resolver-names/Main.hs @@ -8,7 +8,7 @@ import Data.List (stripPrefix) main :: IO () main = do - for_ ["lts-20.26", "nightly-2023-05-26"] $ \snapshot -> do + for_ ["lts-20.26", "lts-21.8"] $ \snapshot -> do stack ["init", "--force", "--resolver", snapshot] str <- readFile "stack.yaml" case mapMaybe (stripPrefix "resolver: ") $ lines str of diff --git a/test/integration/tests/no-rerun-tests/files/stack.yaml b/test/integration/tests/no-rerun-tests/files/stack.yaml index 4324da7693..b76322c7a4 100644 --- a/test/integration/tests/no-rerun-tests/files/stack.yaml +++ b/test/integration/tests/no-rerun-tests/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 diff --git a/test/integration/tests/override-compiler/Main.hs b/test/integration/tests/override-compiler/Main.hs index d35baf0edc..47bf7adbc8 100644 --- a/test/integration/tests/override-compiler/Main.hs +++ b/test/integration/tests/override-compiler/Main.hs @@ -4,4 +4,4 @@ import Control.Monad (unless) main :: IO () main = stackCheckStdout ["exec", "--", "ghc", "--numeric-version"] $ \ver -> -- get rid of the newline character - unless (concat (lines ver) == "9.2.8") $ error $ "Invalid version: " ++ show ver + unless (concat (lines ver) == "9.4.6") $ error $ "Invalid version: " ++ show ver diff --git a/test/integration/tests/override-compiler/files/stack.yaml b/test/integration/tests/override-compiler/files/stack.yaml index b0d2dacbd7..ec63d88fb6 100644 --- a/test/integration/tests/override-compiler/files/stack.yaml +++ b/test/integration/tests/override-compiler/files/stack.yaml @@ -1,3 +1,3 @@ -resolver: lts-13.10 -compiler: ghc-9.2.8 +resolver: lts-20.26 +compiler: ghc-9.4.6 packages: [] diff --git a/test/integration/tests/proper-rebuilds/files/stack.yaml b/test/integration/tests/proper-rebuilds/files/stack.yaml index 4324da7693..b76322c7a4 100644 --- a/test/integration/tests/proper-rebuilds/files/stack.yaml +++ b/test/integration/tests/proper-rebuilds/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 diff --git a/test/integration/tests/relative-script-snapshots/files/subdir/snapshot.yaml b/test/integration/tests/relative-script-snapshots/files/subdir/snapshot.yaml index 67f0936282..34347e1328 100644 --- a/test/integration/tests/relative-script-snapshots/files/subdir/snapshot.yaml +++ b/test/integration/tests/relative-script-snapshots/files/subdir/snapshot.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 name: snapshot packages: - acme-missiles-0.3@rev:0 diff --git a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-extra-dep.yaml b/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-extra-dep.yaml index 3b84ff23e3..47cb9cfed6 100644 --- a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-extra-dep.yaml +++ b/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-extra-dep.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 extra-deps: - async-2.1.1.1 - stm-2.1.2.2 diff --git a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/snapshot.yaml b/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/snapshot.yaml index 21fb2a89a0..3d1cc651b3 100644 --- a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/snapshot.yaml +++ b/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/snapshot.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.8 +resolver: ghc-9.4.6 name: hackage-revisions-are-annoying packages: - async-2.1.1.1 diff --git a/test/integration/tests/upload/files/stack.yaml b/test/integration/tests/upload/files/stack.yaml index b7f596c779..d969c8afdd 100644 --- a/test/integration/tests/upload/files/stack.yaml +++ b/test/integration/tests/upload/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.26 +resolver: lts-21.8 packages: - . diff --git a/test/integration/tests/watched-files/files/stack.yaml b/test/integration/tests/watched-files/files/stack.yaml index fc9172fa2f..7bb6ef2774 100644 --- a/test/integration/tests/watched-files/files/stack.yaml +++ b/test/integration/tests/watched-files/files/stack.yaml @@ -1 +1 @@ -resolver: lts-20.26 +resolver: lts-21.8 From 69da1527b088d5b4ced23e5a1fc3c6fc7cc50906 Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Sun, 18 Jun 2023 15:25:31 +0100 Subject: [PATCH 3/5] Add PackageImports to release.hs --- etc/scripts/release.hs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/etc/scripts/release.hs b/etc/scripts/release.hs index aff73ed492..34962ccf3e 100644 --- a/etc/scripts/release.hs +++ b/etc/scripts/release.hs @@ -8,8 +8,10 @@ -- module imports, being: Cabal, base, bytestring, directory, extra, process, -- shake, tar, zip-archive and zlib. These are either GHC boot packages or in -- the snapshot. Stackage LTS Haskell 21.8 does not include boot packages --- directly. +-- directly. As GHC 9.4.6 boot packages Cabal and Cabal-syntax expose modules +-- with the same names, the language extension PackageImports is required. +{-# LANGUAGE PackageImports #-} {-# LANGUAGE PatternSynonyms #-} {-# LANGUAGE RecordWildCards #-} @@ -32,15 +34,15 @@ import Development.Shake import Development.Shake.FilePath ( (<.>), (), dropFileName, exe, takeDirectory, toStandard ) -import Distribution.PackageDescription +import "Cabal" Distribution.PackageDescription ( PackageDescription (..), packageDescription, pkgVersion ) -import Distribution.PackageDescription.Parsec +import "Cabal" Distribution.PackageDescription.Parsec ( readGenericPackageDescription ) -import Distribution.System +import "Cabal" Distribution.System ( Arch, OS (..), Platform (..), buildPlatform ) -import Distribution.Text ( display, simpleParse ) -import Distribution.Utils.ShortText ( fromShortText ) +import "Cabal" Distribution.Text ( display, simpleParse ) +import "Cabal" Distribution.Utils.ShortText ( fromShortText ) import Distribution.Verbosity ( silent ) import System.Console.GetOpt ( ArgDescr (..), OptDescr (..) ) import System.Directory ( copyFile, getHomeDirectory, removeFile ) From a7118a0a6ed9d47c23ebe6db7a256030ccc5b865 Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Sun, 18 Jun 2023 16:01:09 +0100 Subject: [PATCH 4/5] Reflect Distribution.Simple.PackageDescription.readGenericPackageDescription move --- etc/scripts/release.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/scripts/release.hs b/etc/scripts/release.hs index 34962ccf3e..ae08001dde 100644 --- a/etc/scripts/release.hs +++ b/etc/scripts/release.hs @@ -37,7 +37,7 @@ import Development.Shake.FilePath import "Cabal" Distribution.PackageDescription ( PackageDescription (..), packageDescription, pkgVersion ) -import "Cabal" Distribution.PackageDescription.Parsec +import Distribution.Simple.PackageDescription ( readGenericPackageDescription ) import "Cabal" Distribution.System ( Arch, OS (..), Platform (..), buildPlatform ) From 4724cd58e1465887fb480d089493f1ca0143a876 Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Mon, 21 Aug 2023 16:02:22 +0100 Subject: [PATCH 5/5] Update documentary references, and cabal.config/cabal.project --- .github/workflows/integration-tests.yml | 4 +- .github/workflows/unit-tests.yml | 2 +- CONTRIBUTING.md | 7 +- cabal.config | 145 ++++++++++++------------ cabal.project | 4 +- doc/GUIDE.md | 24 ++-- doc/Stack_and_VS_Code.md | 6 +- doc/custom_snapshot.md | 30 ++--- doc/faq.md | 8 +- doc/list_command.md | 14 +-- doc/script_command.md | 4 +- doc/scripts.md | 20 ++-- doc/stack_yaml_vs_cabal_package_file.md | 4 +- doc/yaml_configuration.md | 6 +- src/Stack/Constants.hs | 8 +- src/Stack/Init.hs | 2 +- 16 files changed, 146 insertions(+), 142 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 051780b7ff..56e4ac8267 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -16,7 +16,7 @@ on: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# As of 8 August 2023, ubuntu-latest, windows-latest and macos-latest come +# As of 21 August 2023, ubuntu-latest, windows-latest and macos-latest come # with Stack 2.11.1 (2.9.3 on macos-latest) and GHC 9.6.2. windows-latest comes # with NSIS 3.08, for which the default value of the 'Unicode' installer # attribute is 'true'. However, that is not the 'large strings' build of NSIS @@ -81,7 +81,7 @@ jobs: nix-channel --add https://nixos.org/channels/nixos-23.05 nixpkgs # Download the Nix expressions for all subscribed channels... # - # As at 2023-08-11, nixos-23.05 provides GHC 9.2.8. + # As at 2023-08-21, nixos-23.05 provides GHC 9.2.8. nix-channel --update # The NIX_PATH environment variable sets a list of directories used to # look up the location of Nix expressions using paths enclosed in diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 2b7e0218a2..cebc187739 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -9,7 +9,7 @@ on: - rc/** workflow_dispatch: -# As of 9 August 2023, ubuntu-latest, windows-latest and macos-latest come +# As of 21 August 2023, ubuntu-latest, windows-latest and macos-latest come # with Stack 2.11.1 (2.9.3 on macos-latest) and GHC 9.6.2. jobs: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4c53de852b..be0a1ff335 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -285,9 +285,10 @@ compatibility with a range of versions of GHC that a library package (such as Stack aims to depend on well-known packages. The specific versions on which it depends at any time are specified by `package.yaml` and `stack.yaml`. It does not aim to be compatible with more than one version of the `Cabal` package at -any time. At the time of writing (May 2023) the package versions are primarily -ones in Stackage snapshot LTS Haskell 20.26 (for GHC 9.2.8), together with -extra-dep `Cabal-3.8.1.0`. +any time. At the time of writing (August 2023) the package versions are +primarily ones in Stackage snapshot LTS Haskell 21.8 (for GHC 9.4.5), together +with extra-deps to depend on the latest versions of `ansi-terminal`, `crypton` +(instead of `cryptonite`), `hpack`, `pantry` and `tar-conduit`. A Stack executable makes use of Cabal (the library) through a small 'Setup' executable that it compiles from Haskell source code. The executable compiles diff --git a/cabal.config b/cabal.config index 54653e2fd0..d442b4bfaf 100644 --- a/cabal.config +++ b/cabal.config @@ -2,11 +2,11 @@ constraints: , Cabal ==3.8.1.0 , Cabal-syntax ==3.8.1.0 , Glob ==0.10.2 - , OneTuple ==0.3.1 - , QuickCheck ==2.14.2 + , OneTuple ==0.4.1.1 + , QuickCheck ==2.14.3 , StateVar ==1.2.2 , Win32 ==2.12.0.1 - , aeson ==2.0.3.0 + , aeson ==2.1.2.1 , aeson-warning-parser ==0.1.0 , annotated-wl-pprint ==0.7.0 , ansi-terminal ==1.0 @@ -16,30 +16,31 @@ constraints: , asn1-encoding ==0.9.6 , asn1-parse ==0.9.5 , asn1-types ==0.3.4 - , assoc ==1.0.2 + , assoc ==1.1 , async ==2.2.4 , attoparsec ==0.14.4 - , attoparsec-iso8601 ==1.0.2.1 + , attoparsec-iso8601 ==1.1.0.0 , auto-update ==0.1.6 - , base ==4.16.4.0 - , base-compat ==0.12.2 - , base-compat-batteries ==0.12.2 - , base-orphans ==0.8.8.2 + , base ==4.17.2.0 + , base-compat ==0.12.3 + , base-compat-batteries ==0.12.3 + , base-orphans ==0.9.0 , base16-bytestring ==1.0.2.0 , base64-bytestring ==1.2.1.0 - , basement ==0.0.15 + , basement ==0.0.16 , bifunctors ==5.5.15 - , binary ==0.8.9.0 + , binary ==0.8.9.1 + , bitvec ==1.1.5.0 , blaze-builder ==0.4.2.2 , blaze-html ==0.9.1.2 , blaze-markup ==0.8.2.8 , byteorder ==1.0.4 - , bytestring ==0.11.4.0 - , casa-client ==0.0.1 + , bytestring ==0.11.5.1 + , casa-client ==0.0.2 , casa-types ==0.0.2 , case-insensitive ==1.2.1.0 , cereal ==0.5.8.3 - , clock ==0.8.3 + , clock ==0.8.4 , cmdargs ==0.10.22 , colour ==2.3.6 , comonad ==5.0.8 @@ -47,48 +48,53 @@ constraints: , conduit ==1.3.5 , conduit-combinators ==1.3.0 , conduit-extra ==1.3.6 - , connection ==0.3.1 - , containers ==0.6.5.1 + , containers ==0.6.7 , contravariant ==1.5.5 , cookie ==0.4.6 , cryptohash-sha256 ==0.11.102.1 - , cryptonite ==0.30 - , cryptonite-conduit ==0.2.2 - , data-array-byte ==0.1.0.1 + , crypton ==0.33 + , crypton-conduit ==0.2.3 + , crypton-connection ==0.3.1 + , crypton-x509 ==1.7.6 + , crypton-x509-store ==1.6.9 + , crypton-x509-system ==1.6.7 + , crypton-x509-validation ==1.6.12 , data-default-class ==0.1.2.0 , data-fix ==0.3.2 - , deepseq ==1.4.6.1 + , deepseq ==1.4.8.0 , digest ==0.0.1.7 - , directory ==1.3.6.2 + , directory ==1.3.7.1 , distributive ==0.6.2.1 , dlist ==1.0 , easy-file ==0.2.5 , echo ==0.1.4 , ed25519 ==0.0.5.0 - , exceptions ==0.10.4 - , extra ==1.7.13 - , fast-logger ==3.1.2 + , exceptions ==0.10.5 + , extra ==1.7.14 + , fast-logger ==3.2.2 , file-embed ==0.0.15.0 - , filelock ==0.1.1.6 + , filelock ==0.1.1.7 , filepath ==1.4.2.2 + , foldable1-classes-compat ==0.1 , fsnotify ==0.4.1.0 - , generic-deriving ==1.14.4 - , ghc-bignum ==1.2 - , ghc-boot-th ==9.2.7 - , ghc-prim ==0.8.0 - , githash ==0.1.6.3 + , generic-deriving ==1.14.5 + , generically ==0.1.1 + , ghc-bignum ==1.3 + , ghc-boot-th ==9.4.6 + , ghc-prim ==0.9.1 + , githash ==0.1.7.0 , hackage-security ==0.6.2.3 - , hashable ==1.4.2.0 + , hashable ==1.4.3.0 , hi-file-parser ==0.1.4.0 , hinotify ==0.4.1 , hourglass ==0.2.12 - , hpack ==0.35.2 + , hpack ==0.35.4 , hpc ==0.6.1.0 - , http-api-data ==0.4.3 + , http-api-data ==0.5 , http-client ==0.7.13.1 - , http-client-tls ==0.3.6.1 - , http-conduit ==2.3.8 - , http-download ==0.2.0.0 + , http-client-tls ==0.3.6.2 + , http-conduit ==2.3.8.1 + , http-download ==0.2.1.0 , http-types ==0.12.3 , indexed-traversable ==0.1.2.1 , indexed-traversable-instances ==0.1.1.2 @@ -100,15 +106,15 @@ constraints: , lift-type ==0.1.1.1 , lifted-base ==0.2.3.12 , lukko ==0.1.1.3 - , megaparsec ==9.2.2 - , memory ==0.17.0 - , microlens ==0.4.12.0 + , megaparsec ==9.3.1 + , memory ==0.18.0 + , microlens ==0.4.13.1 , microlens-mtl ==0.2.0.3 , microlens-th ==0.4.3.13 - , mime-types ==0.1.0.9 + , mime-types ==0.1.1.0 , mintty ==0.1.4 , monad-control ==1.0.3.1 - , monad-logger ==0.3.39 + , monad-logger ==0.3.40 , monad-loops ==0.4.3 , mono-traversable ==1.0.15.3 , mtl ==2.2.2 @@ -122,24 +128,24 @@ constraints: , open-browser ==0.2.1.0 , optparse-applicative ==0.18.1.0 , optparse-simple ==0.1.1.4 - , pantry ==0.9.1 - , parsec ==3.1.15.0 + , pantry ==0.9.2 + , parsec ==3.1.16.1 , parser-combinators ==1.3.0 , path ==0.9.2 - , path-io ==1.7.0 + , path-io ==1.8.1 , path-pieces ==0.2.1 , pem ==0.2.4 - , persistent ==2.14.5.0 + , persistent ==2.14.5.1 , persistent-sqlite ==2.13.1.1 , persistent-template ==2.12.0.0 , pretty ==1.1.3.6 , prettyprinter ==1.7.1 , prettyprinter-ansi-terminal ==1.1.3 - , primitive ==0.7.3.0 - , process ==1.6.16.0 + , primitive ==0.8.0.0 + , process ==1.6.17.0 , project-template ==0.2.1.0 , random ==1.2.1.1 - , resource-pool ==0.2.3.2 + , resource-pool ==0.4.0.0 , resourcet ==1.2.6 , retry ==0.9.3.1 , rio ==0.1.22.0 @@ -147,9 +153,9 @@ constraints: , rio-prettyprint ==0.1.4.0 , rts ==1.0.2 , safe ==0.3.19 - , safe-exceptions ==0.1.7.3 + , safe-exceptions ==0.1.7.4 , scientific ==0.3.7.0 - , semialign ==1.2.0.1 + , semialign ==1.3 , semigroupoids ==5.3.7 , silently ==1.2.5.3 , socks ==0.6.1 @@ -157,45 +163,42 @@ constraints: , splitmix ==0.1.0.4 , stack ==2.12.0 , static-bytes ==0.1.0 - , stm ==2.5.0.2 + , stm ==2.5.1.0 , stm-chans ==3.0.0.9 , streaming-commons ==0.2.2.6 - , strict ==0.4.0.1 - , tagged ==0.8.6.1 + , strict ==0.5 + , tagged ==0.8.7 , tar ==0.5.1.1 - , tar-conduit ==0.3.2 - , template-haskell ==2.18.0.0 + , tar-conduit ==0.4.0 + , template-haskell ==2.19.0.0 , temporary ==1.3 - , text ==1.2.5.0 + , text ==2.0.2 , text-metrics ==0.3.2 , text-short ==0.1.5 , th-abstraction ==0.4.5.0 , th-compat ==0.1.4 - , th-lift ==0.8.3 + , th-lift ==0.8.4 , th-lift-instances ==0.1.20 - , these ==1.1.1.1 - , time ==1.11.1.1 + , these ==1.2 + , time ==1.12.2 , time-compat ==1.9.6.1 - , tls ==1.5.8 + , tls ==1.7.0 , transformers ==0.5.6.2 , transformers-base ==0.4.6 , transformers-compat ==0.7.2 , typed-process ==0.2.11.0 - , unix ==2.7.2.2 - , unix-compat ==0.5.4 - , unix-time ==0.4.9 - , unliftio ==0.2.24.0 + , unix ==2.7.3 + , unix-compat ==0.7 + , unix-time ==0.4.10 + , unliftio ==0.2.25.0 , unliftio-core ==0.2.1.0 , unordered-containers ==0.2.19.1 , uuid-types ==1.0.5 , vault ==0.3.1.5 - , vector ==0.12.3.1 - , vector-algorithms ==0.8.0.4 + , vector ==0.13.0.0 + , vector-algorithms ==0.9.0.1 + , vector-stream ==0.1.0.0 , witherable ==0.4.2 - , x509 ==1.7.7 - , x509-store ==1.6.9 - , x509-system ==1.6.7 - , x509-validation ==1.6.12 - , yaml ==0.11.11.0 + , yaml ==0.11.11.2 , zip-archive ==0.4.3 , zlib ==0.6.3.0 diff --git a/cabal.project b/cabal.project index aa3f47fd6d..8d417c5e6a 100644 --- a/cabal.project +++ b/cabal.project @@ -33,8 +33,8 @@ -- specified by the snapshot specifed in Stack's project-level YAML -- configuration file (`stack.yaml`). The relevant version of GHC can be -- confirmed by reviewing the snapshot on Stackage. For example, at: --- https://www.stackage.org/lts-20.26/cabal.config. +-- https://www.stackage.org/lts-21.8/cabal.config. -- -with-compiler: ghc-9.2.8 +with-compiler: ghc-9.4.6 import: cabal.config packages: . diff --git a/doc/GUIDE.md b/doc/GUIDE.md index 89b9f835d8..dba10960cf 100644 --- a/doc/GUIDE.md +++ b/doc/GUIDE.md @@ -248,15 +248,15 @@ this: ~~~yaml resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/26.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/8.yaml packages: - . ~~~ The value of the `resolver` key tells Stack *how* to build your package: which GHC version to use, versions of package dependencies, and so on. Our value here -says to use [LTS Haskell 20.26](https://www.stackage.org/lts-20.26), which -implies GHC 9.2.8 (which is why `stack build` installs that version of GHC if it +says to use [LTS Haskell 21.8](https://www.stackage.org/lts-21.8), which +implies GHC 9.4.6 (which is why `stack build` installs that version of GHC if it is not already available to Stack). There are a number of values you can use for `resolver`, which we'll cover later. @@ -503,7 +503,7 @@ also known as *snapshots*. We mentioned the LTS resolvers, and you can get quite a bit of information about it at [https://www.stackage.org/lts](https://www.stackage.org/lts), including: -* The appropriate resolver value (`resolver: lts-20.26`, as is currently the +* The appropriate resolver value (`resolver: lts-21.8`, as is currently the latest LTS) * The GHC version used * A full list of all packages available in this snapshot @@ -522,16 +522,16 @@ towards by default as well). ## Resolvers and changing your compiler version -Let's explore package sets a bit further. Instead of `lts-20.26`, let's change +Let's explore package sets a bit further. Instead of `lts-21.8`, let's change our `stack.yaml` file to use the [latest nightly](https://www.stackage.org/nightly). Right now, this is currently -2023-05-26 - please see the resolver from the link above to get the latest. +2023-08-21 - please see the resolver from the link above to get the latest. Then, commanding `stack build` again will produce: ~~~text stack build -# Downloaded nightly-2023-05-26 build plan. +# Downloaded nightly-2023-08-21 build plan. # build output ... ~~~ @@ -539,15 +539,15 @@ We can also change resolvers on the command line, which can be useful in a Continuous Integration (CI) setting, like on Travis. For example, command: ~~~text -stack --resolver lts-18.28 build -# Downloaded lts-18.28 build plan. +stack --resolver lts-20.26 build +# Downloaded lts-20.26 build plan. # build output ... ~~~ When passed on the command line, you also get some additional "short-cut" versions of resolvers: `--resolver nightly` will use the newest Nightly resolver -available, `--resolver lts` will use the newest LTS, and `--resolver lts-20` -will use the newest LTS in the 20.x series. The reason these are only available +available, `--resolver lts` will use the newest LTS, and `--resolver lts-21` +will use the newest LTS in the 21.x series. The reason these are only available on the command line and not in your `stack.yaml` file is that using them: 1. Will slow down your build (since Stack then needs to download information on @@ -1340,7 +1340,7 @@ yields output like: ~~~text Run from outside a project, using implicit global project config -Using latest snapshot resolver: lts-20.26 +Using latest snapshot resolver: lts-21.8 Writing global (non-project-specific) config file to: /home/michael/.stack/global/stack.yaml Note: You can change the snapshot via the resolver field there. I installed the stm package via --package stm diff --git a/doc/Stack_and_VS_Code.md b/doc/Stack_and_VS_Code.md index 68ee325a07..8d8be38311 100644 --- a/doc/Stack_and_VS_Code.md +++ b/doc/Stack_and_VS_Code.md @@ -75,9 +75,9 @@ enabled). For further information about these options, see the `install-ghc` For this workaround to work, each time that a resolver is used that references a different version of GHC, then GHCup must be used to install it (if GHCup has -not already installed that version). For example, to use `resolver: lts-20.26` -(GHC 9.2.8), the command `ghcup install ghc 9.2.8` must have been used to -install GHC 9.2.8. That may be a minor inconvenience for some people, as one the +not already installed that version). For example, to use `resolver: lts-21.8` +(GHC 9.4.6), the command `ghcup install ghc 9.4.6` must have been used to +install GHC 9.4.6. That may be a minor inconvenience for some people, as one the primary benefits of Stack over other Haskell build tools has been that Stack automatically ensures that the necessary version of GHC is available. diff --git a/doc/custom_snapshot.md b/doc/custom_snapshot.md index 1b3df06de3..04702ae3e8 100644 --- a/doc/custom_snapshot.md +++ b/doc/custom_snapshot.md @@ -17,7 +17,7 @@ available in snapshots to ensure reproducibility. snapshot specification. ~~~yaml -resolver: lts-20.26 # Inherits GHC version and package set +resolver: lts-21.8 # Inherits GHC version and package set compiler: ghc-9.6.2 # Overwrites GHC version in the resolver, optional # Additional packages, follows extra-deps syntax @@ -61,35 +61,35 @@ custom snapshot, due to Stack sharing snapshot packages whenever possible. ### Overriding the compiler -The following snapshot specification will be identical to `lts-20.26`, but -instead use `ghc-9.2.7` instead of `ghc-9.2.8`: +The following snapshot specification will be identical to `lts-21.8`, but +instead use `ghc-9.4.5` instead of `ghc-9.4.6`: ~~~yaml -resolver: lts-20.26 -compiler: ghc-9.2.7 +resolver: lts-21.8 +compiler: ghc-9.4.5 ~~~ ### Dropping packages -The following snapshot specification will be identical to `lts-20.26`, but +The following snapshot specification will be identical to `lts-21.8`, but without the `text` package in our snapshot. Removing this package will cause all the packages that depend on `text` to be unbuildable, but they will still be present in the snapshot. ~~~yaml -resolver: lts-20.26 +resolver: lts-21.8 drop-packages: - text ~~~ ### Hiding packages -The following snapshot specification will be identical to `lts-20.26`, but the +The following snapshot specification will be identical to `lts-21.8`, but the `text` package will be hidden when registering. This will affect, for example, the import parser in the script command. ~~~yaml -resolver: lts-20.26 +resolver: lts-21.8 hidden: - text ~~~ @@ -99,13 +99,13 @@ hidden: In order to specify GHC options for a package, you use the same syntax as the [ghc-options](yaml_configuration.md#ghc-options) key for build configuration. -The following snapshot specification will be identical to `lts-20.26`, but +The following snapshot specification will be identical to `lts-21.8`, but provides `-O1` as a ghc-option for `text`: ~~~yaml -resolver: lts-20.26 +resolver: lts-21.8 packages: -- text-1.2.5.0 +- text-2.0.2 ghc-options: text: -O1 ~~~ @@ -122,13 +122,13 @@ packages in the `packages` list, rather than all packages in the snapshot. In order to specify Cabal flags for a package, you use the same syntax as the [flags](yaml_configuration.md#flags) key for build configuration. The -following snapshot specification will be identical to `lts-20.26`, but +following snapshot specification will be identical to `lts-21.8`, but it enables the `developer` Cabal flag: ~~~yaml -resolver: lts-20.26 +resolver: lts-21.8 packages: -- text-1.2.5.0 +- text-2.0.2 flags: text: developer: true diff --git a/doc/faq.md b/doc/faq.md index e603d6aa8b..06c661d94b 100644 --- a/doc/faq.md +++ b/doc/faq.md @@ -9,7 +9,7 @@ here is to be as helpful and concise as possible. ## What version of GHC is used when I run something like `stack ghci`? The version of GHC, as well as which packages can be installed, are specified by -the _resolver_. This may be something like `lts-20.26`, which is from +the _resolver_. This may be something like `lts-21.8`, which is from [Stackage](https://www.stackage.org/). The [user's guide](GUIDE.md) discusses the resolver in more detail. @@ -76,11 +76,11 @@ You can make tweaks to a snapshot by modifying the `extra-deps` configuration value in your `stack.yaml` file, e.g.: ~~~yaml -resolver: lts-20.26 +resolver: lts-21.8 packages: - . extra-deps: -- text-2.0.2 +- text-2.0.2@rev:1 ~~~ ## I need to use a package (or version of a package) that is not available on Hackage, what should I do? @@ -91,7 +91,7 @@ Add it to the directory where your `stack.yaml` file lives, e.g. ~~~yaml -resolver: lts-20.26 +resolver: lts-21.8 packages: - . extra-deps: diff --git a/doc/list_command.md b/doc/list_command.md index b4109f4ab3..e5ed376a5c 100644 --- a/doc/list_command.md +++ b/doc/list_command.md @@ -32,29 +32,29 @@ base-4.18.0.0 unix-2.8.1.1 Win32-2.13.4.0 acme-missiles-0.3 -pantry-0.8.1 +pantry-0.9.2 stack list paltry Could not find package paltry, updating ... Package index cache populated Error: [S-4926] -- Could not find package paltry on Hackage. Perhaps you meant: retry, path, pantry, pretty, pasty, xattr, alloy, para, pappy, alure +- Could not find package paltry on Hackage. Perhaps you meant: pantry, pretty, pasty, xattr, alloy, para, pappy, alure, polar, factory -stack --resolver lts-20.26 list base unix Win32 acme-missiles pantry +stack --resolver lts-21.8 list base unix Win32 acme-missiles pantry Error: [S-4926] - Package does not appear in snapshot: base - Package does not appear in snapshot: unix - Package does not appear in snapshot: acme-missiles -stack --resolver lts-20.26 list Win32 pantry +stack --resolver lts-21.8 list Win32 pantry Win32-2.12.0.1 -pantry-0.5.7 +pantry-0.8.3 -stack --resolver lts-20.26 list +stack --resolver lts-21.8 list AC-Angle-1.0 ALUT-2.4.0.3 ... +zot-0.0.3 zstd-0.1.3.0 -ztail-1.2.0.3 ~~~ diff --git a/doc/script_command.md b/doc/script_command.md index 08cb5146a0..e34286db93 100644 --- a/doc/script_command.md +++ b/doc/script_command.md @@ -18,7 +18,7 @@ configuration files (global and project-level). A snapshot must be specified on the command line (with the `--resolver` option). For example: ~~~text -stack script --resolver lts-20.26 MyScript.hs +stack script --resolver lts-21.8 MyScript.hs ~~~ The `stack script` command behaves as if the `--install-ghc` flag had been @@ -100,7 +100,7 @@ main = do can be compiled and run, with arguments, with: ~~~text -stack --resolver lts-20.26 script --package acme-missiles --compile MyScript.hs -- "Don't panic!" "Duck and cover!" +stack --resolver lts-21.8 script --package acme-missiles --compile MyScript.hs -- "Don't panic!" "Duck and cover!" ~~~ All the compilation outputs (like `Main.hi`, `Main.o`, and the executable diff --git a/doc/scripts.md b/doc/scripts.md index 9cad44e90b..4be00387fe 100644 --- a/doc/scripts.md +++ b/doc/scripts.md @@ -19,7 +19,7 @@ An example will be easiest to understand. Consider the Haskell source file ~~~haskell #!/usr/bin/env stack --- stack script --resolver lts-20.26 --package turtle +-- stack script --resolver lts-21.8 --package turtle {-# LANGUAGE OverloadedStrings #-} import Turtle (echo) main = echo "Hello World!" @@ -78,10 +78,10 @@ able to reuse everything already built). The second line of the source code is the Stack interpreter options comment. In this example, it specifies the `stack script` command with the options of a -LTS Haskell 20.26 snapshot (`--resolver lts-20.26`) and ensuring the +LTS Haskell 21.8 snapshot (`--resolver lts-21.8`) and ensuring the [`turtle` package](https://hackage.haskell.org/package/turtle) is available (`--package turtle`). The version of the package will be that in the specified -snapshot (`lts-20.26` provides `turtle-1.5.25`). +snapshot (`lts-21.8` provides `turtle-1.6.1`). ## Arguments and interpreter options and arguments @@ -116,7 +116,7 @@ For example, the command `stack MyScript.hs arg1 arg2` with `MyScript.hs`: ~~~haskell #!/usr/bin/env stack {- stack script - --resolver lts-20.26 + --resolver lts-21.8 -- +RTS -s -RTS -} @@ -132,7 +132,7 @@ main = do is equivalent to the following command at the command line: ~~~text -stack script --resolver lts-20.26 -- MyScript.hs arg1 arg2 +RTS -s -RTS +stack script --resolver lts-21.8 -- MyScript.hs arg1 arg2 +RTS -s -RTS ~~~ where `+RTS -s -RTS` are some of GHC's @@ -161,7 +161,7 @@ space separated list. For example: ~~~haskell #!/usr/bin/env stack {- stack script - --resolver lts-20.26 + --resolver lts-21.8 --package turtle --package "stm async" --package http-client,http-conduit @@ -191,7 +191,7 @@ which makes use of the joke package ~~~haskell {- stack script - --resolver lts-20.26 + --resolver lts-21.8 --package acme-missiles -} import Acme.Missiles (launchMissiles) @@ -202,7 +202,7 @@ main = launchMissiles The command `stack --script-no-run-compile Script.hs` then behaves as if the command -`stack script --resolver lts-20.26 --package acme-missiles --no-run --compile -- Script.hs` +`stack script --resolver lts-21.8 --package acme-missiles --no-run --compile -- Script.hs` had been given. `Script.hs` is compiled (without optimisation) and the resulting executable is not run: no missiles are launched in the process! @@ -239,7 +239,7 @@ example with `runghc`: {- stack runghc --install-ghc - --resolver lts-20.26 + --resolver lts-21.8 --package base --package turtle -- @@ -262,7 +262,7 @@ it. Here is an example: {- stack exec ghci --install-ghc - --resolver lts-20.26 + --resolver lts-21.8 --package turtle -} ~~~ diff --git a/doc/stack_yaml_vs_cabal_package_file.md b/doc/stack_yaml_vs_cabal_package_file.md index b0400f8982..eacf5f5c9f 100644 --- a/doc/stack_yaml_vs_cabal_package_file.md +++ b/doc/stack_yaml_vs_cabal_package_file.md @@ -64,8 +64,8 @@ requires that you have chosen a specific version for each package available. The most common means by which this set of packages is defined is via a snapshot provided by Stackage. For example, if you go to the page -, you will see a list of 3,055 packages at -specific version numbers. When you then specify `resolver: lts-20.26`, you're +, you will see a list of 3,010 packages at +specific version numbers. When you then specify `resolver: lts-21.8`, you're telling Stack to use those package versions in resolving dependencies down to specific versions of packages. diff --git a/doc/yaml_configuration.md b/doc/yaml_configuration.md index aa3ba97db9..f549ec086a 100644 --- a/doc/yaml_configuration.md +++ b/doc/yaml_configuration.md @@ -98,8 +98,8 @@ installation, and various settings like build flags. It is called a resolver since a snapshot states how dependencies are resolved. There are currently four resolver types: -* LTS Haskell snapshots, e.g. `resolver: lts-20.26` -* Stackage Nightly snapshots, e.g. `resolver: nightly-2023-08-06` +* LTS Haskell snapshots, e.g. `resolver: lts-21.8` +* Stackage Nightly snapshots, e.g. `resolver: nightly-2023-08-21` * No snapshot, just use packages shipped with the compiler. For GHC this looks like `resolver: ghc-9.6.2` * Custom snapshot, via a URL or relative file path. For further information, see @@ -536,7 +536,7 @@ resolvers like `ghc-9.6.2`. This can be used to override the compiler for a Stackage snapshot, like this: ~~~yaml -resolver: lts-20.26 +resolver: lts-21.8 compiler: ghc-9.6.2 compiler-check: match-exact ~~~ diff --git a/src/Stack/Constants.hs b/src/Stack/Constants.hs index c561a8f5d2..2a993f2098 100644 --- a/src/Stack/Constants.hs +++ b/src/Stack/Constants.hs @@ -242,7 +242,7 @@ wiredInPackages = case mparsed of [ "ghc-prim" -- A magic package , "integer-gmp" - -- No longer magic > 1.0.3.0. With GHC 9.2.8 at least, there seems to be + -- No longer magic > 1.0.3.0. With GHC 9.4.6 at least, there seems to be -- no problem in using it. , "integer-simple" -- A magic package @@ -254,16 +254,16 @@ wiredInPackages = case mparsed of -- A magic package , "dph-seq" -- Deprecated in favour of dph-prim-seq, which does not appear to be - -- magic. With GHC 9.2.8 at least, there seems to be no problem in using + -- magic. With GHC 9.4.6 at least, there seems to be no problem in using -- it. , "dph-par" -- Deprecated in favour of dph-prim-par, which does not appear to be - -- magic. With GHC 9.2.8 at least, there seems to be no problem in using + -- magic. With GHC 9.4.6 at least, there seems to be no problem in using -- it. , "ghc" -- A magic package , "interactive" - -- Could not identify information about this package name. With GHC 9.2.8 + -- Could not identify information about this package name. With GHC 9.4.6 -- at least, there seems to be no problem in using it. , "ghc-bignum" -- A magic package diff --git a/src/Stack/Init.hs b/src/Stack/Init.hs index 3af202795b..a2e225187b 100644 --- a/src/Stack/Init.hs +++ b/src/Stack/Init.hs @@ -422,7 +422,7 @@ renderStackYaml p ignoredPackages dupPackages = , "to be used for project dependencies. For example:" , "" , "resolver: lts-21.8" - , "resolver: nightly-2023-08-19" + , "resolver: nightly-2023-08-21" , "resolver: ghc-9.6.2" , "" , "The location of a snapshot can be provided as a file or url. Stack assumes"