From 35a60b28c422a6f8c80ee346c0bb7ddb10bc6679 Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Wed, 5 Nov 2025 21:51:13 +0000 Subject: [PATCH] Bump to lts-24.18 `rio-0.1.24.0` re-exports type operator `~`. --- .devcontainer/devcontainer.json | 4 +- .github/workflows/integration-tests.yml | 24 +++++----- .github/workflows/unit-tests.yml | 4 +- CONTRIBUTING.md | 4 +- cabal.config | 44 +++++++++---------- cabal.project | 4 +- doc/commands/dot_command.md | 2 +- doc/commands/list_command.md | 6 +-- doc/commands/script_command.md | 8 ++-- doc/commands/setup_command.md | 2 +- doc/configure/yaml/non-project.md | 6 +-- doc/configure/yaml/project.md | 10 ++--- doc/faq.md | 10 ++--- doc/install_and_upgrade.md | 2 +- doc/topics/Stack_and_VS_Code.md | 6 +-- doc/topics/custom_snapshot.md | 26 +++++------ doc/topics/haskell_and_c_code.md | 4 +- doc/topics/scripts.md | 24 +++++----- doc/topics/snapshot_location.md | 2 +- .../stack_yaml_vs_cabal_package_file.md | 6 +-- doc/tutorial/building_your_project.md | 6 +-- doc/tutorial/hello_world_example.md | 24 +++++----- doc/tutorial/project_configuration.md | 4 +- etc/scripts/build-stack-installer.hs | 2 +- etc/scripts/release-linux-aarch64.hs | 6 +-- etc/scripts/release.hs | 6 +-- etc/scripts/stack.yaml | 2 +- src/Stack/Constants.hs | 2 +- src/Stack/Init.hs | 4 +- src/Stack/Options/ConfigSetParser.hs | 4 +- src/Stack/Options/SetupParser.hs | 2 +- src/Stack/Prelude.hs | 2 - stack.yaml | 12 ++--- stack.yaml.lock | 15 +++++-- tests/integration/lib/StackTest.hs | 2 +- .../files/my-snapshot.yaml | 2 +- .../files/snapshot-2.yaml | 4 +- .../files/snapshot-modify-lts.yaml | 2 +- .../files/snapshots/local-snapshot.yaml | 2 +- .../files/snapshots/remote-snapshot.yaml | 2 +- .../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/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/stack.yaml | 2 +- .../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/4101-dependency-tree/Main.hs | 10 ++--- .../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 +- .../6372-sdist-unicode-test/files/stack.yaml | 2 +- .../6465-msys-environment/files/stack.yaml | 2 +- .../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 | 2 +- .../tests/cabal-sublibrary-dependency/Main.hs | 2 +- .../files/stack.yaml | 2 +- .../tests/copy-bins-works/files/stack.yaml | 2 +- .../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/files/stack.yaml | 2 +- .../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 +- .../tests/mutable-deps/files/stack.yaml | 2 +- .../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 | 2 +- .../tests/proper-rebuilds/files/stack.yaml | 2 +- .../files/subdir/snapshot.yaml | 2 +- .../tests/script-extra-dep/files/script.hs | 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 +- tests/unit/Stack/ConfigSpec.hs | 22 +++++----- 141 files changed, 276 insertions(+), 269 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 88d951af36..92c2fa7581 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,9 +1,9 @@ { - "name": "GHC 9.10.2 (default)", + "name": "GHC 9.10.3 (default)", "build": { "dockerfile": "GHC.Dockerfile", "args": { - "GHC_VERSION": "9.10.2", + "GHC_VERSION": "9.10.3", // "SUBTAG": "int-native", "HLS_VERSION": "2.12.0.0", "USE_ZSH_FOR_ROOT": "unset-to-use-ash", diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index a48437b31c..551b7f2a5f 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -16,11 +16,11 @@ on: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# As of 15 March 2025, ubuntu-latest and windows-latest come with Stack 3.3.1 -# and GHC 9.12.1. However, macos-13 and macos-latest do not come with Haskell -# tools. windows-latest comes with NSIS 3.10, for which the default value of the -# 'Unicode' installer attribute is 'true'. However, that is not the 'large -# strings' build of NSIS and creates installers that corrupt the PATH +# As of 2025-11-05, ubuntu-latest and windows-latest come with Stack 3.7.1 +# and GHC 9.12.2. However, macos-13 and macos-latest do not come with Haskell +# tools. windows-latest no longer comes with NSIS 3.10, for which the default +# value of the 'Unicode' installer attribute is 'true'. However, that is not the +# 'large strings' build of NSIS and creates installers that corrupt the PATH # environment variable if the default string length of 1024 characters is # exceeded. @@ -34,27 +34,27 @@ jobs: include: - os: ubuntu-latest release-args: "--alpine" - cache-bust: "2024-05-17" + cache-bust: "2025-11-05" # On public preview since 16 January 2025 - os: ubuntu-24.04-arm # Stack's project-level configuration (stack.yaml) specifies the # multi-architecture (including Linux/Aarch64) Docker image published # by Oliver Benz (@benz0li, on GitHub). That image comes with - # Stack 3.3.1. (Note that the online documentation for + # Stack 3.7.1. (Note that the online documentation for # '--docker-stack-exe image' specifies that the host Stack and image # Stack must have the same version number.) release-args: "--alpine --stack-args --docker-stack-exe=image" - cache-bust: "2025-02-07b" + cache-bust: "2025-11-05" - os: windows-latest release-args: "" - cache-bust: "2025-04-06" + cache-bust: "2025-11-05" - os: macos-13 release-args: "" - cache-bust: "2024-05-17" + cache-bust: "2024-11-05" # macos-latest provides macOS/AArch64 (M1) - os: macos-latest release-args: "" - cache-bust: "2024-05-17" + cache-bust: "2024-11-05" steps: - name: Clone project uses: actions/checkout@v4 @@ -99,7 +99,7 @@ jobs: if [[ "${{ matrix.os }}" == "ubuntu-24.04-arm" || "${{ matrix.os }}" == "macos-13" || "${{ matrix.os }}" == "macos-latest" ]] then # ubuntu-24.04-arm, macos-13 and macos-latest do not include Haskell - # tools as at 2025-03-15. + # tools as at 2025-11-05. curl -sSL https://get.haskellstack.org/ | sh fi diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index a89c09875b..41e771d6b9 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -9,8 +9,8 @@ on: - rc/** workflow_dispatch: -# As of 15 March 2025, ubuntu-latest and windows-latest come with Stack 3.3.1 -# and GHC 9.12.1. However, macos-latest does not come with Haskell tools. +# As of 2025-11-5, ubuntu-latest and windows-latest come with Stack 3.7.1 +# and GHC 9.12.2. However, macos-latest does not come with Haskell tools. jobs: pedantic: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index aeab23e10b..804b3e1c35 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -352,7 +352,7 @@ 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 (August 2025) the package versions are -primarily ones in Stackage snapshot LTS Haskell 24.9 (for GHC 9.10.2), the +primarily ones in Stackage snapshot LTS Haskell 24.18 (for GHC 9.10.3), the latest version of `Cabal` released on Hackage (`Cabal-3.16.0.0`) and `pantry-0.11.0`. @@ -690,7 +690,7 @@ for each file. [Stan](https://hackage.haskell.org/package/stan) is a Haskell static analysis tool. As of `stan-0.1.0.1`, it supports GHC >= 9.6.3 and Stack is built with -GHC 9.10.2. The tool is configured by the contents of the `.stan.toml` file. +GHC 9.10.3. The tool is configured by the contents of the `.stan.toml` file. This workflow will run if: diff --git a/cabal.config b/cabal.config index 9cab4832e7..625297a510 100644 --- a/cabal.config +++ b/cabal.config @@ -19,11 +19,11 @@ constraints: , asn1-types ==0.3.4 , assoc ==1.1.1 , async ==2.2.5 - , atomic-counter ==0.1.2.3 + , atomic-counter ==0.1.2.4 , attoparsec ==0.14.4 , attoparsec-aeson ==2.2.2.0 , auto-update ==0.2.6 - , base ==4.20.1.0 + , base ==4.20.2.0 , base-orphans ==0.9.3 , base16-bytestring ==1.0.2.0 , base64-bytestring ==1.2.1.0 @@ -31,13 +31,13 @@ constraints: , bifunctors ==5.6.2 , binary ==0.8.9.3 , bitvec ==1.1.5.0 - , blaze-builder ==0.4.4 + , blaze-builder ==0.4.4.1 , blaze-html ==0.9.2.0 , blaze-markup ==0.8.3.0 , byteorder ==1.0.4 , bytestring ==0.12.2.0 - , casa-client ==0.0.2 - , casa-types ==0.0.2 + , casa-client ==0.0.3 + , casa-types ==0.0.3 , case-insensitive ==1.2.1.0 , cborg ==0.2.10.0 , cereal ==0.5.8.3 @@ -59,7 +59,7 @@ constraints: , crypton-connection ==0.4.5 , crypton-socks ==0.6.2 , crypton-x509 ==1.7.7 - , crypton-x509-store ==1.6.11 + , crypton-x509-store ==1.6.12 , crypton-x509-system ==1.6.7 , crypton-x509-validation ==1.6.14 , data-default ==0.8.0.1 @@ -79,19 +79,19 @@ constraints: , fast-logger ==3.2.6 , file-embed ==0.0.16.0 , file-io ==0.1.5 - , filelock ==0.1.1.7 + , filelock ==0.1.1.8 , filepath ==1.5.4.0 - , fsnotify ==0.4.3.0 + , fsnotify ==0.4.4.0 , generic-deriving ==1.14.6 , generically ==0.1.1 , ghc-bignum ==1.3 - , ghc-boot ==9.10.2 - , ghc-boot-th ==9.10.2 - , ghc-internal ==9.1002.0 + , ghc-boot ==9.10.3 + , ghc-boot-th ==9.10.3 + , ghc-internal ==9.1003.0 , ghc-platform ==0.1.0.0 , ghc-prim ==0.12.0 , githash ==0.1.7.0 - , hackage-security ==0.6.3.1 + , hackage-security ==0.6.3.2 , half ==0.3.3 , happy ==2.1.7 , happy-lib ==2.1.7 @@ -100,7 +100,7 @@ constraints: , haskell-src-meta ==0.8.15 , hi-file-parser ==0.1.8.0 , hourglass ==0.2.12 - , hpack ==0.38.2 + , hpack ==0.38.3 , hpc ==0.7.0.2 , http-api-data ==0.6.2 , http-client ==0.7.19 @@ -141,8 +141,8 @@ constraints: , open-browser ==0.4.0.0 , optparse-applicative ==0.18.1.0 , optparse-simple ==0.1.1.4 - , os-string ==2.0.4 - , pantry ==0.11.0 + , os-string ==2.0.7 + , pantry ==0.11.2 , parsec ==3.1.18.0 , parser-combinators ==1.3.0 , path ==0.9.6 @@ -156,14 +156,14 @@ constraints: , prettyprinter ==1.7.1 , prettyprinter-ansi-terminal ==1.1.3 , primitive ==0.9.1.0 - , process ==1.6.25.0 + , process ==1.6.26.1 , project-template ==0.2.1.0 , random ==1.2.1.3 , replace-megaparsec ==1.5.0.1 , resource-pool ==0.4.0.0 , resourcet ==1.3.0 , retry ==0.9.3.1 - , rio ==0.1.22.0 + , rio ==0.1.23.0 , rio-orphans ==0.1.2.0 , rio-prettyprint ==0.1.8.0 , rts ==1.0.2 @@ -180,7 +180,7 @@ constraints: , static-bytes ==0.1.1 , stm ==2.5.3.1 , stm-chans ==3.0.0.9 - , streaming-commons ==0.2.3.0 + , streaming-commons ==0.2.3.1 , strict ==0.5.1 , string-interpolate ==0.3.4.0 , syb ==0.7.2.4 @@ -190,7 +190,7 @@ constraints: , tasty ==1.5.3 , template-haskell ==2.22.0.0 , temporary ==1.3 - , text ==2.1.2 + , text ==2.1.3 , text-conversions ==0.3.1.1 , text-iso8601 ==0.1.1 , text-metrics ==0.3.3 @@ -211,11 +211,11 @@ constraints: , transformers-compat ==0.7.2 , typed-process ==0.2.13.0 , unix ==2.8.6.0 - , unix-compat ==0.7.4 + , unix-compat ==0.7.4.1 , unix-time ==0.4.17 , unliftio ==0.2.25.1 , unliftio-core ==0.2.1.0 - , unordered-containers ==0.2.20 + , unordered-containers ==0.2.20.1 , utf8-string ==1.0.2 , uuid-types ==1.0.6 , vault ==0.3.1.5 @@ -225,5 +225,5 @@ constraints: , witherable ==0.5 , yaml ==0.11.11.2 , zip-archive ==0.4.3.2 - , zlib ==0.7.1.0 + , zlib ==0.7.1.1 , zlib-clib ==1.3.1 diff --git a/cabal.project b/cabal.project index f7ecc5c03f..ea735b889c 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-24.9/cabal.config. +-- https://www.stackage.org/lts-24.18/cabal.config. -- -with-compiler: ghc-9.10.2 +with-compiler: ghc-9.10.3 import: cabal.config packages: . diff --git a/doc/commands/dot_command.md b/doc/commands/dot_command.md index 3a82f626f4..618f9fc813 100644 --- a/doc/commands/dot_command.md +++ b/doc/commands/dot_command.md @@ -59,7 +59,7 @@ of the diagram). The following examples are based on the package [`wreq-0.5.4.3`](https://hackage.haskell.org/package/wreq-0.5.4.3) and the boot -packages of GHC 9.10.2. In each case, the output from `stack dot` is piped as an +packages of GHC 9.10.3. In each case, the output from `stack dot` is piped as an input into Graphviz's `dot` or `twopi` executables, and the executable produces output in the form of a SVG file named `wreq-example*.svg`. diff --git a/doc/commands/list_command.md b/doc/commands/list_command.md index e020f00225..f8f30e6b3e 100644 --- a/doc/commands/list_command.md +++ b/doc/commands/list_command.md @@ -45,17 +45,17 @@ Error: [S-4926] tasty, retry, path, pretty, pasty, xattr, alloy, para, pappy and alure. -stack --snapshot lts-24.9 list base unix Win32 acme-missiles pantry +stack --snapshot lts-24.18 list base unix Win32 acme-missiles pantry Error: [S-4926] * Package does not appear in snapshot (directly or indirectly): acme-missiles. -stack --snapshot lts-24.9 list base unix Win32 pantry +stack --snapshot lts-24.18 list base unix Win32 pantry base-4.20.1.0 unix-2.8.6.0 Win32-2.14.1.0 pantry-0.10.1 -stack --snapshot lts-24.9 list +stack --snapshot lts-24.18 list AC-Angle-1.0 ALUT-2.4.0.3 ... diff --git a/doc/commands/script_command.md b/doc/commands/script_command.md index 7eeedfde10..5e624d069d 100644 --- a/doc/commands/script_command.md +++ b/doc/commands/script_command.md @@ -49,7 +49,7 @@ A snapshot must be specified on the command line, using the `--snapshot` option. For example: ~~~text -stack script --snapshot lts-24.9 MyScript.hs +stack script --snapshot lts-24.18 MyScript.hs ~~~ An immutable extra-dep can be added to the snapshot on the command line with the @@ -211,7 +211,7 @@ main = do can be compiled and run, with arguments, with: ~~~text -stack --snapshot lts-24.9 script --package acme-missiles --compile MyScript.hs -- "Don't panic!" "Duck and cover!" +stack --snapshot lts-24.18 script --package acme-missiles --compile MyScript.hs -- "Don't panic!" "Duck and cover!" ~~~ `acme-missiles-0.3` (the most recent version in the package index) will be used. @@ -231,7 +231,7 @@ snapshot as an extra-dep. The `stack script` command is specified using Stack's ~~~haskell {- stack script - -- snapshot lts-24.9 + -- snapshot lts-24.18 -- extra-dep acme-missiles-0.2 -- package acme-missiles -} @@ -333,7 +333,7 @@ A Haskell source file `MyScript.hs`, as follows: ~~~haskell {- stack script - --snapshot lts-24.9 + --snapshot lts-24.18 -} {-# LANGUAGE OverloadedStrings #-} diff --git a/doc/commands/setup_command.md b/doc/commands/setup_command.md index 5146e102d8..fccb980c3c 100644 --- a/doc/commands/setup_command.md +++ b/doc/commands/setup_command.md @@ -13,7 +13,7 @@ By default: * the version of GHC is the one required by the project. Specify the version of GHC as an argument to attempt to install a different version of GHC. For - example `stack setup 9.10.2` will attempt to install GHC 9.10.2; and + example `stack setup 9.10.3` will attempt to install GHC 9.10.3; and * an attempt to install is made only if the version of GHC is not already available to Stack. Pass the flag `--reinstall` (disabled by default) to diff --git a/doc/configure/yaml/non-project.md b/doc/configure/yaml/non-project.md index 0ade8bf6bb..551a033381 100644 --- a/doc/configure/yaml/non-project.md +++ b/doc/configure/yaml/non-project.md @@ -295,13 +295,13 @@ Command line equivalent (takes precedence): `--compiler` option Overrides the version of the compiler (and, implicitly, its boot packages) in the snapshot. Note that the `compiler-check` flag also applies to the version -numbers. This uses the same syntax as compiler snapshots like `ghc-9.10.2`. This +numbers. This uses the same syntax as compiler snapshots like `ghc-9.10.3`. This can be used to override the compiler (and, implicitly, its boot packages) for a Stackage snapshot, like this: ~~~yaml -snapshot: lts-24.9 -compiler: ghc-9.10.1 +snapshot: lts-24.18 +compiler: ghc-9.10.2 compiler-check: match-exact ~~~ diff --git a/doc/configure/yaml/project.md b/doc/configure/yaml/project.md index 8b190f6da3..ca22dc9c61 100644 --- a/doc/configure/yaml/project.md +++ b/doc/configure/yaml/project.md @@ -40,10 +40,10 @@ installation, and various settings like build flags. It is also called a resolver since a snapshot states how dependencies are resolved. There are currently four snapshot types: -* LTS Haskell snapshots, e.g. `snapshot: lts-24.9` +* LTS Haskell snapshots, e.g. `snapshot: lts-24.18` * Stackage Nightly snapshots, e.g. `snapshot: nightly-2025-08-17` * No snapshot, just use packages shipped with the compiler. For GHC this looks - like `snapshot: ghc-9.10.2` + like `snapshot: ghc-9.10.3` * Custom snapshot, via a URL or relative file path. For further information, see the [snapshot location](../../topics/snapshot_location.md) documentation. @@ -207,9 +207,9 @@ the same name. boot packages in a build plan may limit what can be specified as an extra-dep. - For example, GHC boot package `ghc-9.10.2` has a dependency on `process`. Its - `*.conf` file identifies the dependency as `process-1.6.25.0-68e9`. If - package `ghc-9.10.2` is part of a build plan and a different version of + For example, GHC boot package `ghc-9.10.3` has a dependency on `process`. Its + `*.conf` file identifies the dependency as `process-1.6.26.1-10ef`. If + package `ghc-9.10.3` is part of a build plan and a different version of `process` is specified as an extra-dep, during a build, Stack will identify that the build plan refers to two versions of `process` and warn that the build is likely to fail. diff --git a/doc/faq.md b/doc/faq.md index d6a45fe569..3357196751 100644 --- a/doc/faq.md +++ b/doc/faq.md @@ -126,9 +126,9 @@ ~~~text myproject/ - stack-ghc-9.10.2.yaml + stack-ghc-9.10.3.yaml stack-ghc-9.8.4.yaml - stack.yaml --> symlink to stack-ghc-9.10.2.yaml + stack.yaml --> symlink to stack-ghc-9.10.3.yaml myproject.cabal src/ ... @@ -140,21 +140,21 @@ === "Unix-like" ~~~text - STACK_YAML=stack-ghc-9.10.2.yaml + STACK_YAML=stack-ghc-9.10.3.yaml stack build ~~~ === "Windows" ~~~text - $Env:STACK_YAML='stack-ghc-9.10.2.yaml' + $Env:STACK_YAML='stack-ghc-9.10.3.yaml' stack build ~~~ === "Windows (Command Prompt)" ~~~text - set STACK_YAML=stack-ghc-9.10.2.yaml + set STACK_YAML=stack-ghc-9.10.3.yaml stack build ~~~ diff --git a/doc/install_and_upgrade.md b/doc/install_and_upgrade.md index d9eec1d294..d900db1118 100644 --- a/doc/install_and_upgrade.md +++ b/doc/install_and_upgrade.md @@ -464,7 +464,7 @@ Stack can be installed directly or by using the GHCup tool. |GHC version|LLVM versions| |-----------|-------------| |9.12.2 |11 to 15 | - |9.10.2 |11 to 15 | + |9.10.3 |11 to 15 | |9.8.4 |11 to 15 | |9.6.7 |11 to 15 | |9.4.8 |10 to 14 | diff --git a/doc/topics/Stack_and_VS_Code.md b/doc/topics/Stack_and_VS_Code.md index c3a8cbf30a..68bae3914b 100644 --- a/doc/topics/Stack_and_VS_Code.md +++ b/doc/topics/Stack_and_VS_Code.md @@ -150,9 +150,9 @@ VS Code with the 'Haskell' extension can be configured in a number of ways: Each time that a snapshot 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 `snapshot: lts-24.9` - (GHC 9.10.2), the command `ghcup install ghc 9.10.2` must have been used - to install GHC 9.10.2. That may be a minor inconvenience for some people, + installed that version). For example, to use `snapshot: lts-24.18` + (GHC 9.10.3), the command `ghcup install ghc 9.10.3` must have been used + to install GHC 9.10.3. That may be a minor inconvenience for some people, as one the primary benefits of Stack over other tools for building Haskell code has been that Stack automatically ensures that the necessary version of GHC is available. diff --git a/doc/topics/custom_snapshot.md b/doc/topics/custom_snapshot.md index a124559c43..63fcb1f0db 100644 --- a/doc/topics/custom_snapshot.md +++ b/doc/topics/custom_snapshot.md @@ -30,7 +30,7 @@ available in snapshots to ensure reproducibility. ~~~yaml # Inherits a specific GHC version and, implicitly, its boot packages and # specific versions of a set of other packages: -snapshot: lts-24.9 +snapshot: lts-24.18 # Overwrites the version of GHC (and, implicitly, its boot packages) specified # in the snapshot (optional): compiler: ghc-9.10.1 @@ -76,36 +76,36 @@ custom snapshot, due to Stack sharing snapshot packages whenever possible. ### Overriding the compiler -The following snapshot specification will be identical to `lts-24.9`, but -instead use `ghc-9.10.1` and its boot packages instead of `ghc-9.10.2` and its +The following snapshot specification will be identical to `lts-24.18`, but +instead use `ghc-9.10.2` and its boot packages instead of `ghc-9.10.3` and its boot packages: ~~~yaml -snapshot: lts-24.9 # GHC 9.10.2 -compiler: ghc-9.10.1 +snapshot: lts-24.18 # GHC 9.10.3 +compiler: ghc-9.10.2 ~~~ ### Dropping packages -The following snapshot specification will be identical to `lts-24.9`, but +The following snapshot specification will be identical to `lts-24.18`, 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 -snapshot: lts-24.9 +snapshot: lts-24.18 drop-packages: - text ~~~ ### Hiding packages -The following snapshot specification will be identical to `lts-24.9`, but the +The following snapshot specification will be identical to `lts-24.18`, but the `text` package will be hidden when registering. This will affect, for example, the import parser in the script command. ~~~yaml -snapshot: lts-24.9 +snapshot: lts-24.18 hidden: - text ~~~ @@ -116,11 +116,11 @@ In order to specify GHC options for a package, you use the same syntax as the [ghc-options](../configure/yaml/non-project.md#ghc-options) key for build configuration. -The following snapshot specification will be identical to `lts-24.9`, but +The following snapshot specification will be identical to `lts-24.18`, but provides `-O1` as a ghc-option for `text`: ~~~yaml -snapshot: lts-24.9 +snapshot: lts-24.18 packages: - text-2.1.2 ghc-options: @@ -139,11 +139,11 @@ 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](../configure/yaml/project.md#flags) key for build configuration. The -following snapshot specification will be identical to `lts-24.9`, but +following snapshot specification will be identical to `lts-24.18`, but it enables the `developer` Cabal flag: ~~~yaml -snapshot: lts-24.9 +snapshot: lts-24.18 packages: - text-2.1.2 flags: diff --git a/doc/topics/haskell_and_c_code.md b/doc/topics/haskell_and_c_code.md index 1b6be929b8..ae2d741b3c 100644 --- a/doc/topics/haskell_and_c_code.md +++ b/doc/topics/haskell_and_c_code.md @@ -83,7 +83,7 @@ executables: The project's `stack.yaml` file only needs to identify a snapshot: ~~~yaml -snapshot: lts-24.9 # GHC 9.10.2 +snapshot: lts-24.18 # GHC 9.10.3 ~~~ This example project can be built with Stack in the normal way (`stack build`), @@ -220,7 +220,7 @@ The `include-dirs` key will cause the specified directory (again, The project's `stack.yaml` file only needs to identify a snapshot: ~~~yaml -snapshot: lts-24.9 # GHC 9.10.2 +snapshot: lts-24.18 # GHC 9.10.3 ~~~ This example project can be built with Stack in the normal way (`stack build`), diff --git a/doc/topics/scripts.md b/doc/topics/scripts.md index 1f3d0fc0a8..b64c4f04bc 100644 --- a/doc/topics/scripts.md +++ b/doc/topics/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 --snapshot lts-24.9 --package turtle +-- stack script --snapshot lts-24.18 --package turtle {-# LANGUAGE OverloadedStrings #-} import Turtle (echo) main = echo "Hello World!" @@ -78,11 +78,11 @@ 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`](../commands/script_command.md) -command with the options of a LTS Haskell 24.9 snapshot -(`--snapshot lts-24.9`) and ensuring the +command with the options of a LTS Haskell 24.18 snapshot +(`--snapshot lts-24.18`) and ensuring the [`turtle`](https://hackage.haskell.org/package/turtle) package is available (`--package turtle`). The version of the package will be that in the specified -snapshot (`lts-24.9` provides `turtle-1.6.2`). +snapshot (`lts-24.18` provides `turtle-1.6.2`). ## Arguments and interpreter options and arguments @@ -117,7 +117,7 @@ For example, the command `stack MyScript.hs arg1 arg2` with `MyScript.hs`: ~~~haskell #!/usr/bin/env stack {- stack script - --snapshot lts-24.9 + --snapshot lts-24.18 -- +RTS -s -RTS -} @@ -133,7 +133,7 @@ main = do is equivalent to the following command at the command line: ~~~text -stack script --snapshot lts-24.9 -- MyScript.hs arg1 arg2 +RTS -s -RTS +stack script --snapshot lts-24.18 -- MyScript.hs arg1 arg2 +RTS -s -RTS ~~~ where `+RTS -s -RTS` are some of GHC's @@ -164,7 +164,7 @@ options, or by providing a comma or space separated list. For example: ~~~haskell #!/usr/bin/env stack {- stack script - --snapshot lts-24.9 + --snapshot lts-24.18 --package turtle --package "stm async" --package http-client,http-conduit @@ -180,7 +180,7 @@ each. For example: ~~~haskell #!/usr/bin/env stack {- stack script - --snapshot lts-24.9 + --snapshot lts-24.18 --extra-dep acme-missiles-0.3@rev:0 --extra-dep "{git: git@github.com:yesodweb/wai, commit: '2f8a8e1b771829f4a8a77c0111352ce45a14c30f', subdirs: [auto-update, wai]}" -} @@ -227,7 +227,7 @@ which makes use of the joke package ~~~haskell {- stack script - --snapshot lts-24.9 + --snapshot lts-24.18 --package acme-missiles -} import Acme.Missiles (launchMissiles) @@ -238,7 +238,7 @@ main = launchMissiles The command `stack --script-no-run-compile Script.hs` then behaves as if the command -`stack script --snapshot lts-24.9 --package acme-missiles --no-run --compile -- Script.hs` +`stack script --snapshot lts-24.18 --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! @@ -280,7 +280,7 @@ those curious, here is an example with {- stack runghc --install-ghc - --snapshot lts-24.9 + --snapshot lts-24.18 --package base --package turtle -- @@ -304,7 +304,7 @@ it. Here is an example: {- stack exec ghci --install-ghc - --snapshot lts-24.9 + --snapshot lts-24.18 --package turtle -} ~~~ diff --git a/doc/topics/snapshot_location.md b/doc/topics/snapshot_location.md index 3c5e4cad93..5af52323f2 100644 --- a/doc/topics/snapshot_location.md +++ b/doc/topics/snapshot_location.md @@ -20,7 +20,7 @@ There are essentially four different ways of specifying a snapshot location: for example: ~~~yaml - snapshot: ghc-9.10.2 + snapshot: ghc-9.10.3 ~~~ 2. Via a URL pointing to a snapshot configuration file, for example: diff --git a/doc/topics/stack_yaml_vs_cabal_package_file.md b/doc/topics/stack_yaml_vs_cabal_package_file.md index 57724dd8a2..25ce190f54 100644 --- a/doc/topics/stack_yaml_vs_cabal_package_file.md +++ b/doc/topics/stack_yaml_vs_cabal_package_file.md @@ -64,9 +64,9 @@ 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,407 packages at -specific version numbers. When you then specify `snapshot: lts-24.9` or, -alternatively, `resolver: lts-24.9`, you are telling Stack to use those package +, you will see a list of 3,407 packages at +specific version numbers. When you then specify `snapshot: lts-24.18` or, +alternatively, `resolver: lts-24.18`, you are telling Stack to use those package versions in resolving dependencies down to specific versions of packages. Sometimes a snapshot does not have all of the packages that you want. Or you diff --git a/doc/tutorial/building_your_project.md b/doc/tutorial/building_your_project.md index c53f8c5a9a..c20441a454 100644 --- a/doc/tutorial/building_your_project.md +++ b/doc/tutorial/building_your_project.md @@ -249,7 +249,7 @@ With that out of the way, let us dig a little bit more into these snapshots. We mentioned the LTS snapshots, and you can get information about it at [https://www.stackage.org/lts](https://www.stackage.org/lts), including: -* The appropriate value (`lts-24.9`, as is currently the latest LTS) +* The appropriate value (`lts-24.18`, as is currently the latest LTS) * The GHC version used * A full list of all packages versions available in this snapshot * The ability to perform a Hoogle search on the packages in this snapshot @@ -276,9 +276,9 @@ versions. [homepage](https://www.stackage.org/) lists the most recent Stackage snapshot. In most cases, that is the snapshot you should use. -??? question "Can I use a snapshot like `ghc-9.10.2`?" +??? question "Can I use a snapshot like `ghc-9.10.3`?" - Snapshot `ghc-9.10.2` specifies GHC 9.10.2 and, consequently, the GHC boot + Snapshot `ghc-9.10.3` specifies GHC 9.10.3 and, consequently, the GHC boot packages that come with that compiler. However, the snapshot does not include the many other package versions that will work with that compiler. For a set of those package versions, see the snapshots published by the diff --git a/doc/tutorial/hello_world_example.md b/doc/tutorial/hello_world_example.md index 06ca425072..8c8fef3a9c 100644 --- a/doc/tutorial/hello_world_example.md +++ b/doc/tutorial/hello_world_example.md @@ -59,7 +59,7 @@ creating manually a Stack project-level configuration file named `stack.yaml` in `my-project`, with the contents: ~~~yaml -snapshot: lts-24.9 +snapshot: lts-24.18 ~~~ By adding those two files (one to describe a package, the other to configure the @@ -208,7 +208,7 @@ will then build your project. The end of the output should look similar to this: ... helloworld> configure (lib + exe) Configuring helloworld-0.1.0.0... - helloworld> build (lib + exe) with ghc-9.10.2 + helloworld> build (lib + exe) with ghc-9.10.3 Preprocessing library for helloworld-0.1.0.0.. Building library for helloworld-0.1.0.0.. [1 of 2] Compiling Lib @@ -217,9 +217,9 @@ will then build your project. The end of the output should look similar to this: Building executable 'helloworld-exe' for helloworld-0.1.0.0.. [1 of 2] Compiling Main [2 of 2] Compiling Paths_helloworld - [3 of 3] Linking .stack-work/dist/x86_64-linux-tinfo6/ghc-9.10.2/build/helloworld-exe/helloworld-exe + [3 of 3] Linking .stack-work/dist/x86_64-linux-tinfo6/ghc-9.10.3/build/helloworld-exe/helloworld-exe helloworld> copy/register - Installing library in .../helloworld/.stack-work/install/x86_64-linux-tinfo6/a2caceceda039eb4f791856f85a68f9582d4daf3d0527344693ff3d1fcd92ba4/9.6.6/lib/x86_64-linux-ghc-9.10.2/helloworld-0.1.0.0-KFyX8zLxDvzLZURq3JaCVX + Installing library in .../helloworld/.stack-work/install/x86_64-linux-tinfo6/a2caceceda039eb4f791856f85a68f9582d4daf3d0527344693ff3d1fcd92ba4/9.6.6/lib/x86_64-linux-ghc-9.10.3/helloworld-0.1.0.0-KFyX8zLxDvzLZURq3JaCVX Installing executable helloworld-exe in .../helloworld/.stack-work/install/x86_64-linux-tinfo6/a2caceceda039eb4f791856f85a68f9582d4daf3d0527344693ff3d1fcd92ba4/9.6.6/bin Registering library for helloworld-0.1.0.0.. ~~~ @@ -230,7 +230,7 @@ will then build your project. The end of the output should look similar to this: ... helloworld> configure (lib + exe) Configuring helloworld-0.1.0.0... - helloworld> build (lib + exe) with ghc-9.10.2 + helloworld> build (lib + exe) with ghc-9.10.3 Preprocessing library for helloworld-0.1.0.0.. Building library for helloworld-0.1.0.0.. [1 of 2] Compiling Lib @@ -241,7 +241,7 @@ will then build your project. The end of the output should look similar to this: [2 of 2] Compiling Paths_helloworld [3 of 3] Linking .stack-work\dist\effaccc7\build\helloworld-exe\helloworld-exe.exe helloworld> copy/register - Installing library in ...\helloworld\.stack-work\install\c8c71a24\lib\x86_64-windows-ghc-9.10.2\helloworld-0.1.0.0-KFyX8zLxDvzLZURq3JaCVX + Installing library in ...\helloworld\.stack-work\install\c8c71a24\lib\x86_64-windows-ghc-9.10.3\helloworld-0.1.0.0-KFyX8zLxDvzLZURq3JaCVX Installing executable helloworld-exe in ...\helloworld\.stack-work\install\c8c71a24\bin Registering library for helloworld-0.1.0.0.. ~~~ @@ -261,7 +261,7 @@ and that the final step involved the installation of an executable named ~~~text helloworld> configure (lib + exe) ... -helloworld> build (lib + exe) with ghc-9.10.2 +helloworld> build (lib + exe) with ghc-9.10.3 ... helloworld> copy/register ... @@ -346,18 +346,18 @@ The start of the output should look similar to this: helloworld-0.1.0.0: unregistering (components added: test:helloworld-test) helloworld> configure (lib + exe + test) Configuring helloworld-0.1.0.0... - helloworld> build (lib + exe + test) with ghc-9.10.2 + helloworld> build (lib + exe + test) with ghc-9.10.3 Preprocessing library for helloworld-0.1.0.0.. Building library for helloworld-0.1.0.0.. Preprocessing test suite 'helloworld-test' for helloworld-0.1.0.0.. Building test suite 'helloworld-test' for helloworld-0.1.0.0.. [1 of 2] Compiling Main [2 of 2] Compiling Paths_helloworld - [3 of 3] Linking .stack-work/dist/x86_64-linux-tinfo6/ghc-9.10.2/build/helloworld-test/helloworld-test + [3 of 3] Linking .stack-work/dist/x86_64-linux-tinfo6/ghc-9.10.3/build/helloworld-test/helloworld-test Preprocessing executable 'helloworld-exe' for helloworld-0.1.0.0.. Building executable 'helloworld-exe' for helloworld-0.1.0.0.. helloworld> copy/register - Installing library in .../helloworld/.stack-work/install/x86_64-linux-tinfo6/a2caceceda039eb4f791856f85a68f9582d4daf3d0527344693ff3d1fcd92ba4/9.6.6/lib/x86_64-linux-ghc-9.10.2/helloworld-0.1.0.0-KFyX8zLxDvzLZURq3JaCVX + Installing library in .../helloworld/.stack-work/install/x86_64-linux-tinfo6/a2caceceda039eb4f791856f85a68f9582d4daf3d0527344693ff3d1fcd92ba4/9.6.6/lib/x86_64-linux-ghc-9.10.3/helloworld-0.1.0.0-KFyX8zLxDvzLZURq3JaCVX Installing executable helloworld-exe in .../helloworld/.stack-work/install/x86_64-linux-tinfo6/a2caceceda039eb4f791856f85a68f9582d4daf3d0527344693ff3d1fcd92ba4/9.6.6/bin Registering library for helloworld-0.1.0.0.. ~~~ @@ -368,7 +368,7 @@ The start of the output should look similar to this: helloworld-0.1.0.0: unregistering (components added: test:helloworld-test) helloworld> configure (lib + exe + test) Configuring helloworld-0.1.0.0... - helloworld> build (lib + exe + test) with ghc-9.10.2 + helloworld> build (lib + exe + test) with ghc-9.10.3 Preprocessing library for helloworld-0.1.0.0.. Building library for helloworld-0.1.0.0.. Preprocessing test suite 'helloworld-test' for helloworld-0.1.0.0.. @@ -379,7 +379,7 @@ The start of the output should look similar to this: Preprocessing executable 'helloworld-exe' for helloworld-0.1.0.0.. Building executable 'helloworld-exe' for helloworld-0.1.0.0.. helloworld> copy/register - Installing library in ...\helloworld\.stack-work\install\0aa166fa\lib\x86_64-windows-ghc-9.10.2\helloworld-0.1.0.0-KFyX8zLxDvzLZURq3JaCVX + Installing library in ...\helloworld\.stack-work\install\0aa166fa\lib\x86_64-windows-ghc-9.10.3\helloworld-0.1.0.0-KFyX8zLxDvzLZURq3JaCVX Installing executable helloworld-exe in ...\helloworld\.stack-work\install\0aa166fa\bin Registering library for helloworld-0.1.0.0.. ~~~ diff --git a/doc/tutorial/project_configuration.md b/doc/tutorial/project_configuration.md index 9cd6bd77d2..399822860a 100644 --- a/doc/tutorial/project_configuration.md +++ b/doc/tutorial/project_configuration.md @@ -44,8 +44,8 @@ The key [`snapshot`](../configure/yaml/project.md#snapshot) is a project-specific configuration option. Its value tells Stack *how* to build your package: which version of GHC (and, implicitly, its boot packages) to use; which versions of other package dependencies to use, and so on. Our value here says to -use [LTS Haskell 24.9](https://www.stackage.org/lts-24.9), which implies -GHC 9.10.2 (which is why `stack build` installs that version of GHC if it is not +use [LTS Haskell 24.18](https://www.stackage.org/lts-24.18), which implies +GHC 9.10.3 (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 `snapshot`, which we will cover later. diff --git a/etc/scripts/build-stack-installer.hs b/etc/scripts/build-stack-installer.hs index 0367d6ebba..ff1e7bfb56 100644 --- a/etc/scripts/build-stack-installer.hs +++ b/etc/scripts/build-stack-installer.hs @@ -1,5 +1,5 @@ {- stack script - --snapshot lts-24.9 + --snapshot lts-24.18 --package nsis -} {-# LANGUAGE OverloadedStrings #-} diff --git a/etc/scripts/release-linux-aarch64.hs b/etc/scripts/release-linux-aarch64.hs index 4c3d1a7341..23fe8e6653 100644 --- a/etc/scripts/release-linux-aarch64.hs +++ b/etc/scripts/release-linux-aarch64.hs @@ -1,5 +1,5 @@ {- stack script - --snapshot lts-24.9 + --snapshot lts-24.18 --ghc-options -Wall -} @@ -7,8 +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. Stackage LTS Haskell 24.9 does not include boot packages --- directly. As GHC 9.10.2 boot packages Cabal and Cabal-syntax expose modules +-- the snapshot. Stackage LTS Haskell 24.18 does not include boot packages +-- directly. As GHC 9.10.3 boot packages Cabal and Cabal-syntax expose modules -- with the same names, the language extension PackageImports is required. -- EXPERIMENTAL diff --git a/etc/scripts/release.hs b/etc/scripts/release.hs index b6ea9a59fe..291c88ef1e 100644 --- a/etc/scripts/release.hs +++ b/etc/scripts/release.hs @@ -1,5 +1,5 @@ {- stack script - --snapshot lts-24.9 + --snapshot lts-24.18 --ghc-options -Wall -} @@ -7,8 +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. Stackage LTS Haskell 24.9 does not include boot packages --- directly. As GHC 9.10.2 boot packages Cabal and Cabal-syntax expose modules +-- the snapshot. Stackage LTS Haskell 24.18 does not include boot packages +-- directly. As GHC 9.10.3 boot packages Cabal and Cabal-syntax expose modules -- with the same names, the language extension PackageImports is required. -- EXPERIMENTAL diff --git a/etc/scripts/stack.yaml b/etc/scripts/stack.yaml index 1a48ef37ee..b690678538 100644 --- a/etc/scripts/stack.yaml +++ b/etc/scripts/stack.yaml @@ -6,4 +6,4 @@ # build-stack-installer.hs. The work around is to build the package required for # that script using the same Stack configuration as used by the script. -snapshot: lts-24.9 +snapshot: lts-24.18 diff --git a/src/Stack/Constants.hs b/src/Stack/Constants.hs index e5e62f1f4e..6ddfea5b19 100644 --- a/src/Stack/Constants.hs +++ b/src/Stack/Constants.hs @@ -282,7 +282,7 @@ wiredInPackages (ACGhc ghcVersion) = case mparsed of -- as if they were defined in modules all sharing a common package -- interactive. See 'Note [The interactive package]' at -- https://gitlab.haskell.org/ghc/ghc/-/blob/master/compiler/GHC/Runtime/Context.hs - -- With GHC 9.10.2 at least, there seems to be no problem in using it. + -- With GHC 9.10.3 at least, there seems to be no problem in using it. ] <> [ "base" | ghcVersion < mkVersion [9, 12] ] -- A formerly magic package. diff --git a/src/Stack/Init.hs b/src/Stack/Init.hs index 7a19613cf7..1d15cb0e00 100644 --- a/src/Stack/Init.hs +++ b/src/Stack/Init.hs @@ -437,9 +437,9 @@ renderStackYaml p ignoredPackages dupPackages = , "A snapshot resolver dictates the compiler version and the set of packages" , "to be used for project dependencies. For example:" , "" - , "snapshot: lts-24.9" + , "snapshot: lts-24.18" , "snapshot: nightly-2025-08-17" - , "snapshot: ghc-9.10.2" + , "snapshot: ghc-9.10.3" , "" , "The location of a snapshot can be provided as a file or url. Stack assumes" , "a snapshot provided as a file might change, whereas a url resource does not." diff --git a/src/Stack/Options/ConfigSetParser.hs b/src/Stack/Options/ConfigSetParser.hs index 5b7af928e5..7f66d2980b 100644 --- a/src/Stack/Options/ConfigSetParser.hs +++ b/src/Stack/Options/ConfigSetParser.hs @@ -36,7 +36,7 @@ configCmdSetParser = <$> OA.argument readAbstractSnapshot ( OA.metavar "SNAPSHOT" - <> OA.help "E.g. \"nightly\" or \"lts-24.9\"" )) + <> OA.help "E.g. \"nightly\" or \"lts-24.18\"" )) ( OA.progDesc "Change the snapshot of the current project." )) , OA.command "resolver" @@ -45,7 +45,7 @@ configCmdSetParser = <$> OA.argument readAbstractSnapshot ( OA.metavar "SNAPSHOT" - <> OA.help "E.g. \"nightly\" or \"lts-24.9\"" )) + <> OA.help "E.g. \"nightly\" or \"lts-24.18\"" )) ( OA.progDesc "Change the snapshot of the current project, using the \ \resolver key." )) diff --git a/src/Stack/Options/SetupParser.hs b/src/Stack/Options/SetupParser.hs index 277e642746..946d9aba5c 100644 --- a/src/Stack/Options/SetupParser.hs +++ b/src/Stack/Options/SetupParser.hs @@ -25,7 +25,7 @@ setupOptsParser :: OA.Parser SetupCmdOpts setupOptsParser = SetupCmdOpts <$> OA.optional (OA.argument readVersion ( OA.metavar "GHC_VERSION" - <> OA.help "Version of GHC to install, e.g. 9.10.2. (default: install \ + <> OA.help "Version of GHC to install, e.g. 9.10.3. (default: install \ \the version implied by the snapshot)" )) <*> OA.boolFlags False diff --git a/src/Stack/Prelude.hs b/src/Stack/Prelude.hs index bca91f6d2e..b0976e669d 100644 --- a/src/Stack/Prelude.hs +++ b/src/Stack/Prelude.hs @@ -54,7 +54,6 @@ module Stack.Prelude , StyleSpec , StylesUpdate (..) , (<+>) - , type (~) , align , bulletedList , debugBracket @@ -110,7 +109,6 @@ import Data.Conduit.Process.Typed ( byteStringInput, createSource, withLoggedProcess_ ) import Data.Foldable ( Foldable(foldr') ) import qualified Data.Text.IO as T -import Data.Type.Equality ( type (~) ) import Distribution.Types.LibraryName ( LibraryName (..) ) import Distribution.Types.MungedPackageId ( MungedPackageId (..) ) import Distribution.Types.MungedPackageName ( MungedPackageName (..) ) diff --git a/stack.yaml b/stack.yaml index e22e0be589..242f76bde8 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,19 +1,21 @@ -snapshot: lts-24.9 # GHC 9.10.2 +snapshot: lts-24.18 # GHC 9.10.3 extra-deps: -# lts-24.9 specifies Cabal-3.12.1.0 +# lts-24.18 specifies Cabal-3.12.1.0 - Cabal-3.16.0.0@sha256:7d5d80355ac02c42cb90ec575d83653139a2054ab9aac0753527ced8f343c6b3,14024 - Cabal-syntax-3.16.0.0@sha256:6a35036763557301876c5b7a448de4f1cb54fe1e223ff6c4c0c1fdd6df635a65,7509 -# lts-24.9 specifies pantry-0.10.1 +# lts-24.18 specifies pantry-0.10.1 - pantry-0.11.2@sha256:bc14e75f512deb22e0d9d645e62eb63b319d1732bfed6509491601215ecbd307,7896 +# lts-24.18 specifies rio-0.1.23.0 +- rio-0.1.24.0@sha256:c8f45307e917cb5e8c88a42726c407af8fb900033c15d1feefad54be80859be4,3690 docker: enable: false - repo: quay.io/benz0li/ghc-musl:9.10.2 + repo: quay.io/benz0li/ghc-musl:9.10.3 # See LICENSE. In order to build a statically-linked Stack executable for Linux # that is not linked against GMP, use this alternative Docker image: -# repo: quay.io/benz0li/ghc-musl:9.10.2-int-native +# repo: quay.io/benz0li/ghc-musl:9.10.3-int-native nix: # --nix on the command-line to enable. diff --git a/stack.yaml.lock b/stack.yaml.lock index 9de4707e44..42b6904514 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -25,9 +25,16 @@ packages: size: 2722 original: hackage: pantry-0.11.2@sha256:bc14e75f512deb22e0d9d645e62eb63b319d1732bfed6509491601215ecbd307,7896 +- completed: + hackage: rio-0.1.24.0@sha256:c8f45307e917cb5e8c88a42726c407af8fb900033c15d1feefad54be80859be4,3690 + pantry-tree: + sha256: 0d588cfcd2761ccd21477433781c042ce7c7c70765990e8bfe87cedc9e8d96a3 + size: 4802 + original: + hackage: rio-0.1.24.0@sha256:c8f45307e917cb5e8c88a42726c407af8fb900033c15d1feefad54be80859be4,3690 snapshots: - completed: - sha256: 188228e10dbb5b533bae584049b112e72000902e64b17348679a69f92fbc0d32 - size: 726076 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/24/9.yaml - original: lts-24.9 + sha256: 4cb7085bcc4e7d0b58a523df16a25201800a076f643445ec4f8bb78a94be652f + size: 726109 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/24/18.yaml + original: lts-24.18 diff --git a/tests/integration/lib/StackTest.hs b/tests/integration/lib/StackTest.hs index a2133cc14d..785c403d14 100644 --- a/tests/integration/lib/StackTest.hs +++ b/tests/integration/lib/StackTest.hs @@ -278,7 +278,7 @@ isMacOSX = os == "darwin" -- the main @stack.yaml@. -- defaultSnapshotArg :: String -defaultSnapshotArg = "--snapshot=lts-24.9" +defaultSnapshotArg = "--snapshot=lts-24.18" -- | Remove a file and ignore any warnings about missing files. removeFileIgnore :: HasCallStack => FilePath -> IO () diff --git a/tests/integration/tests/111-custom-snapshot/files/my-snapshot.yaml b/tests/integration/tests/111-custom-snapshot/files/my-snapshot.yaml index 6646725037..8d13ffd0dc 100644 --- a/tests/integration/tests/111-custom-snapshot/files/my-snapshot.yaml +++ b/tests/integration/tests/111-custom-snapshot/files/my-snapshot.yaml @@ -1,4 +1,4 @@ -compiler: ghc-9.10.2 +compiler: ghc-9.10.3 name: my-snapshot packages: - mtl-2.3.1 diff --git a/tests/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml b/tests/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml index 86bccffaf6..58134d368e 100644 --- a/tests/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml +++ b/tests/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml @@ -1,9 +1,9 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 name: test-snapshot-2 packages: - async-2.2.5 - hashable-1.5.0.0 -- os-string-2.0.4 +- os-string-2.0.7 - stm-2.5.3.1 - zlib-0.7.1.0@rev:2 # FIXME: test these here diff --git a/tests/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml b/tests/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml index 2889dd0d33..a0fe3d713e 100644 --- a/tests/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml +++ b/tests/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml @@ -1,4 +1,4 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 name: snapshot-modify-lts drop-packages: - zlib diff --git a/tests/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml b/tests/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml index 6b0437a365..5d90e1a8f5 100644 --- a/tests/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml +++ b/tests/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml @@ -1,4 +1,4 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 name: local-snapshot packages: - archive: package-0.1.2.3.tar.gz diff --git a/tests/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml b/tests/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml index 71b03b3155..03ac56cb54 100644 --- a/tests/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml +++ b/tests/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml @@ -1,4 +1,4 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 name: remote-snapshot packages: - archive: https://s3.amazonaws.com/hackage.fpcomplete.com/package/acme-missiles-0.3.tar.gz diff --git a/tests/integration/tests/1337-unicode-everywhere/files/stack.yaml b/tests/integration/tests/1337-unicode-everywhere/files/stack.yaml index 7295acde5f..bee1e9b7f5 100644 --- a/tests/integration/tests/1337-unicode-everywhere/files/stack.yaml +++ b/tests/integration/tests/1337-unicode-everywhere/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 diff --git a/tests/integration/tests/1438-configure-options/files/stack-everything.yaml b/tests/integration/tests/1438-configure-options/files/stack-everything.yaml index 2929bb054a..5346941606 100644 --- a/tests/integration/tests/1438-configure-options/files/stack-everything.yaml +++ b/tests/integration/tests/1438-configure-options/files/stack-everything.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 extra-deps: - acme-dont-1.1@rev:0 diff --git a/tests/integration/tests/1438-configure-options/files/stack-locals.yaml b/tests/integration/tests/1438-configure-options/files/stack-locals.yaml index 6c828ea4ba..cf64377233 100644 --- a/tests/integration/tests/1438-configure-options/files/stack-locals.yaml +++ b/tests/integration/tests/1438-configure-options/files/stack-locals.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 extra-deps: - acme-dont-1.1@rev:0 diff --git a/tests/integration/tests/1438-configure-options/files/stack-name.yaml b/tests/integration/tests/1438-configure-options/files/stack-name.yaml index 33b77ac83e..4201e42892 100644 --- a/tests/integration/tests/1438-configure-options/files/stack-name.yaml +++ b/tests/integration/tests/1438-configure-options/files/stack-name.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 extra-deps: - acme-dont-1.1@rev:0 diff --git a/tests/integration/tests/1438-configure-options/files/stack-targets.yaml b/tests/integration/tests/1438-configure-options/files/stack-targets.yaml index c1ad113a82..65bd272f28 100644 --- a/tests/integration/tests/1438-configure-options/files/stack-targets.yaml +++ b/tests/integration/tests/1438-configure-options/files/stack-targets.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 extra-deps: - acme-dont-1.1@rev:0 diff --git a/tests/integration/tests/1659-skip-component/files/stack.yaml b/tests/integration/tests/1659-skip-component/files/stack.yaml index 7295acde5f..bee1e9b7f5 100644 --- a/tests/integration/tests/1659-skip-component/files/stack.yaml +++ b/tests/integration/tests/1659-skip-component/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 diff --git a/tests/integration/tests/1884-url-to-tarball/files/stack.yaml b/tests/integration/tests/1884-url-to-tarball/files/stack.yaml index 9c7a8b418e..f545409624 100644 --- a/tests/integration/tests/1884-url-to-tarball/files/stack.yaml +++ b/tests/integration/tests/1884-url-to-tarball/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 extra-deps: - location: https://hackage.haskell.org/package/half-0.2.2.3/half-0.2.2.3.tar.gz sha256: 85c244c80d1c889a3d79073a6f5a99d9e769dbe3c574ca11d992b2b4f7599a5c diff --git a/tests/integration/tests/2195-depend-on-exe/files/stack.yaml b/tests/integration/tests/2195-depend-on-exe/files/stack.yaml index 7295acde5f..bee1e9b7f5 100644 --- a/tests/integration/tests/2195-depend-on-exe/files/stack.yaml +++ b/tests/integration/tests/2195-depend-on-exe/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 diff --git a/tests/integration/tests/2433-ghc-by-version/files/run.sh b/tests/integration/tests/2433-ghc-by-version/files/run.sh index 6aafc3eee5..d872149b5c 100644 --- a/tests/integration/tests/2433-ghc-by-version/files/run.sh +++ b/tests/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.10.2 --compiler-bin):$PATH +export PATH=$(pwd)/fake-path:$("$STACK_EXE" path --resolver ghc-9.10.3 --compiler-bin):$PATH export STACK_ROOT=$(pwd)/fake-root which ghc -"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.10.2 ghc -- --info -"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.10.2 runghc foo.hs +"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.10.3 ghc -- --info +"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.10.3 runghc foo.hs diff --git a/tests/integration/tests/2781-shadow-bug/files/stack.yaml b/tests/integration/tests/2781-shadow-bug/files/stack.yaml index 5c6cdb2430..e0a635d446 100644 --- a/tests/integration/tests/2781-shadow-bug/files/stack.yaml +++ b/tests/integration/tests/2781-shadow-bug/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 packages: - foo - bar diff --git a/tests/integration/tests/2997-ensure-warnings-output/files/stack.yaml b/tests/integration/tests/2997-ensure-warnings-output/files/stack.yaml index a404ed37ec..ccbffc5198 100644 --- a/tests/integration/tests/2997-ensure-warnings-output/files/stack.yaml +++ b/tests/integration/tests/2997-ensure-warnings-output/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 packages: - foo - bar diff --git a/tests/integration/tests/32-unlisted-module/files/stack.yaml b/tests/integration/tests/32-unlisted-module/files/stack.yaml index 7295acde5f..bee1e9b7f5 100644 --- a/tests/integration/tests/32-unlisted-module/files/stack.yaml +++ b/tests/integration/tests/32-unlisted-module/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 diff --git a/tests/integration/tests/3315-multi-ghc-options/files/stack.yaml b/tests/integration/tests/3315-multi-ghc-options/files/stack.yaml index 7295acde5f..bee1e9b7f5 100644 --- a/tests/integration/tests/3315-multi-ghc-options/files/stack.yaml +++ b/tests/integration/tests/3315-multi-ghc-options/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 diff --git a/tests/integration/tests/335-multi-package-flags/files/stack.yaml b/tests/integration/tests/335-multi-package-flags/files/stack.yaml index 7295acde5f..bee1e9b7f5 100644 --- a/tests/integration/tests/335-multi-package-flags/files/stack.yaml +++ b/tests/integration/tests/335-multi-package-flags/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 diff --git a/tests/integration/tests/3390-unbuildable-test/files/stack.yaml b/tests/integration/tests/3390-unbuildable-test/files/stack.yaml index 4de2aff65a..e674eab75a 100644 --- a/tests/integration/tests/3390-unbuildable-test/files/stack.yaml +++ b/tests/integration/tests/3390-unbuildable-test/files/stack.yaml @@ -1 +1 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 diff --git a/tests/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml b/tests/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml index a5b3f30a33..f0236625e2 100644 --- a/tests/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml +++ b/tests/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 name: custom1 packages: - acme-missiles-0.3 diff --git a/tests/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml b/tests/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml index 817522b406..8f88ff08da 100644 --- a/tests/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml +++ b/tests/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 name: custom2 packages: - acme-missiles-0.2 diff --git a/tests/integration/tests/345-override-bytestring/files/stack.yaml b/tests/integration/tests/345-override-bytestring/files/stack.yaml index d94e9c6166..f250b66ce7 100644 --- a/tests/integration/tests/345-override-bytestring/files/stack.yaml +++ b/tests/integration/tests/345-override-bytestring/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 extra-deps: - bytestring-0.11.5.4 - binary-0.8.9.0 diff --git a/tests/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml b/tests/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml index 0256fd8a3b..ba9e89ac52 100644 --- a/tests/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml +++ b/tests/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml @@ -1,4 +1,4 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 packages: - ./local-mmorph diff --git a/tests/integration/tests/3574-extra-dep-local/files/stack.yaml b/tests/integration/tests/3574-extra-dep-local/files/stack.yaml index 4ea022e245..828a411b7a 100644 --- a/tests/integration/tests/3574-extra-dep-local/files/stack.yaml +++ b/tests/integration/tests/3574-extra-dep-local/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 packages: [] diff --git a/tests/integration/tests/3591-cabal-warnings-once/files/stack.yaml b/tests/integration/tests/3591-cabal-warnings-once/files/stack.yaml index 7295acde5f..bee1e9b7f5 100644 --- a/tests/integration/tests/3591-cabal-warnings-once/files/stack.yaml +++ b/tests/integration/tests/3591-cabal-warnings-once/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 diff --git a/tests/integration/tests/365-invalid-success/files/stack.yaml b/tests/integration/tests/365-invalid-success/files/stack.yaml index 7295acde5f..bee1e9b7f5 100644 --- a/tests/integration/tests/365-invalid-success/files/stack.yaml +++ b/tests/integration/tests/365-invalid-success/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 diff --git a/tests/integration/tests/366-non-root-dir/files/stack.yaml b/tests/integration/tests/366-non-root-dir/files/stack.yaml index 7295acde5f..bee1e9b7f5 100644 --- a/tests/integration/tests/366-non-root-dir/files/stack.yaml +++ b/tests/integration/tests/366-non-root-dir/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 diff --git a/tests/integration/tests/370-invalid-setup-hs/files/stack.yaml b/tests/integration/tests/370-invalid-setup-hs/files/stack.yaml index 4de2aff65a..e674eab75a 100644 --- a/tests/integration/tests/370-invalid-setup-hs/files/stack.yaml +++ b/tests/integration/tests/370-invalid-setup-hs/files/stack.yaml @@ -1 +1 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 diff --git a/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml b/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml index 7295acde5f..bee1e9b7f5 100644 --- a/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml +++ b/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 diff --git a/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml b/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml index 13dfb11d4d..17c7ae14e7 100644 --- a/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml +++ b/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 packages: - ./bad-bounds.tar diff --git a/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml b/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml index bf2e2a1ec6..3980df2b36 100644 --- a/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml +++ b/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 extra-deps: - ./bad-bounds.tar diff --git a/tests/integration/tests/3863-purge-command/files/stack.yaml b/tests/integration/tests/3863-purge-command/files/stack.yaml index 7295acde5f..bee1e9b7f5 100644 --- a/tests/integration/tests/3863-purge-command/files/stack.yaml +++ b/tests/integration/tests/3863-purge-command/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 diff --git a/tests/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml b/tests/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml index 414f28eeff..01c7b866fc 100644 --- a/tests/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml +++ b/tests/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 extra-deps: - stm-2.4.4.1 - mtl-2.2.1 diff --git a/tests/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml b/tests/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml index ed3482d7e7..911c9c7645 100644 --- a/tests/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml +++ b/tests/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 extra-deps: - stm-2.5.1.0 - mtl-2.2.2 diff --git a/tests/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml b/tests/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml index 3a8670ba8e..83faa1d622 100644 --- a/tests/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml +++ b/tests/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml @@ -1,3 +1,3 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 extra-deps: - base-4.10.1.0 diff --git a/tests/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml b/tests/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml index 7295acde5f..bee1e9b7f5 100644 --- a/tests/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml +++ b/tests/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml @@ -1 +1 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 diff --git a/tests/integration/tests/3942-solver-error-output/files/test-stack.yml b/tests/integration/tests/3942-solver-error-output/files/test-stack.yml index ccdf0fa903..716a4161eb 100644 --- a/tests/integration/tests/3942-solver-error-output/files/test-stack.yml +++ b/tests/integration/tests/3942-solver-error-output/files/test-stack.yml @@ -1,4 +1,4 @@ -resolver: lts-24.9 +resolver: lts-24.18 packages: [] diff --git a/tests/integration/tests/3959-order-of-flags/files/stack.yaml b/tests/integration/tests/3959-order-of-flags/files/stack.yaml index 7295acde5f..bee1e9b7f5 100644 --- a/tests/integration/tests/3959-order-of-flags/files/stack.yaml +++ b/tests/integration/tests/3959-order-of-flags/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 diff --git a/tests/integration/tests/397-case-insensitive-flags/files/stack.yaml b/tests/integration/tests/397-case-insensitive-flags/files/stack.yaml index 7295acde5f..bee1e9b7f5 100644 --- a/tests/integration/tests/397-case-insensitive-flags/files/stack.yaml +++ b/tests/integration/tests/397-case-insensitive-flags/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 diff --git a/tests/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml b/tests/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml index 414f28eeff..01c7b866fc 100644 --- a/tests/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml +++ b/tests/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 extra-deps: - stm-2.4.4.1 - mtl-2.2.1 diff --git a/tests/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml b/tests/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml index 7295acde5f..bee1e9b7f5 100644 --- a/tests/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml +++ b/tests/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 diff --git a/tests/integration/tests/4001-excess-recompilation/files/stack.yaml b/tests/integration/tests/4001-excess-recompilation/files/stack.yaml index 4de2aff65a..e674eab75a 100644 --- a/tests/integration/tests/4001-excess-recompilation/files/stack.yaml +++ b/tests/integration/tests/4001-excess-recompilation/files/stack.yaml @@ -1 +1 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 diff --git a/tests/integration/tests/4044-no-run-tests-config/files/stack.yaml b/tests/integration/tests/4044-no-run-tests-config/files/stack.yaml index 749e7b9cd9..a2a5183fa0 100644 --- a/tests/integration/tests/4044-no-run-tests-config/files/stack.yaml +++ b/tests/integration/tests/4044-no-run-tests-config/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 build: test-arguments: diff --git a/tests/integration/tests/4101-dependency-tree/Main.hs b/tests/integration/tests/4101-dependency-tree/Main.hs index ca88828587..0edaa6370c 100644 --- a/tests/integration/tests/4101-dependency-tree/Main.hs +++ b/tests/integration/tests/4101-dependency-tree/Main.hs @@ -8,7 +8,7 @@ main = unless isWindows $ do stackCheckStdout ["ls", "dependencies", "tree"] $ \stdOut -> do let expected = unlines [ "Packages" , "├─┬ files 0.1.0.0" - , "│ ├─┬ base 4.20.1.0" + , "│ ├─┬ base 4.20.2.0" ] unless (expected `isPrefixOf` stdOut) $ error $ unlines [ "Expected:", expected, "Actual:", stdOut ] @@ -16,12 +16,12 @@ main = unless isWindows $ do stackCheckStdout ["ls", "dependencies", "tree", "--depth=1"] $ \stdOut -> do let expected = unlines [ "Packages" , "├─┬ files 0.1.0.0" - , "│ ├── base 4.20.1.0" + , "│ ├── base 4.20.2.0" , "│ ├── filelock 0.1.1.2" , "│ ├── mtl 2.3.1" , "│ └── subproject 0.1.0.0" , "└─┬ subproject 0.1.0.0" - , " └── base 4.20.1.0" + , " └── base 4.20.2.0" ] when (stdOut /= expected) $ error $ unlines [ "Expected:", expected, "Actual:", stdOut ] @@ -29,8 +29,8 @@ main = unless isWindows $ do stackCheckStdout ["ls", "dependencies", "tree", "subproject"] $ \stdOut -> do let expected = unlines [ "Packages" , "└─┬ subproject 0.1.0.0" - , " └─┬ base 4.20.1.0" - , " ├─┬ ghc-internal 9.1002.0" + , " └─┬ base 4.20.2.0" + , " ├─┬ ghc-internal 9.1003.0" , " │ ├─┬ ghc-bignum 1.3" , " │ │ └─┬ ghc-prim 0.12.0" , " │ │ └── rts 1.0.2" diff --git a/tests/integration/tests/4101-dependency-tree/files/stack.yaml b/tests/integration/tests/4101-dependency-tree/files/stack.yaml index bc5776e33f..7142a2aa4a 100644 --- a/tests/integration/tests/4101-dependency-tree/files/stack.yaml +++ b/tests/integration/tests/4101-dependency-tree/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 packages: - . - subproject diff --git a/tests/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml b/tests/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml index 7295acde5f..bee1e9b7f5 100644 --- a/tests/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml +++ b/tests/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 diff --git a/tests/integration/tests/4215-missing-unregister/files/stack1.yaml b/tests/integration/tests/4215-missing-unregister/files/stack1.yaml index 4ab12190e5..b671072761 100644 --- a/tests/integration/tests/4215-missing-unregister/files/stack1.yaml +++ b/tests/integration/tests/4215-missing-unregister/files/stack1.yaml @@ -1,3 +1,3 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 packages: - v1 diff --git a/tests/integration/tests/4215-missing-unregister/files/stack2.yaml b/tests/integration/tests/4215-missing-unregister/files/stack2.yaml index a9e4095cef..9ed3d120f8 100644 --- a/tests/integration/tests/4215-missing-unregister/files/stack2.yaml +++ b/tests/integration/tests/4215-missing-unregister/files/stack2.yaml @@ -1,3 +1,3 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 packages: - v2 diff --git a/tests/integration/tests/4270-files-order/files/stack.yaml b/tests/integration/tests/4270-files-order/files/stack.yaml index 7295acde5f..bee1e9b7f5 100644 --- a/tests/integration/tests/4270-files-order/files/stack.yaml +++ b/tests/integration/tests/4270-files-order/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 diff --git a/tests/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml b/tests/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml index 4de2aff65a..e674eab75a 100644 --- a/tests/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml +++ b/tests/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml @@ -1 +1 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 diff --git a/tests/integration/tests/4390-dot-no-ghc/files/stack.yaml b/tests/integration/tests/4390-dot-no-ghc/files/stack.yaml index 4de2aff65a..e674eab75a 100644 --- a/tests/integration/tests/4390-dot-no-ghc/files/stack.yaml +++ b/tests/integration/tests/4390-dot-no-ghc/files/stack.yaml @@ -1 +1 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 diff --git a/tests/integration/tests/4453-detailed/files/stack.yaml b/tests/integration/tests/4453-detailed/files/stack.yaml index 7295acde5f..bee1e9b7f5 100644 --- a/tests/integration/tests/4453-detailed/files/stack.yaml +++ b/tests/integration/tests/4453-detailed/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 diff --git a/tests/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml b/tests/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml index 4de2aff65a..e674eab75a 100644 --- a/tests/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml +++ b/tests/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml @@ -1 +1 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 diff --git a/tests/integration/tests/4488-newer-cabal-version/files/stack-good.yaml b/tests/integration/tests/4488-newer-cabal-version/files/stack-good.yaml index 9b542e10c8..04b1b6ac84 100644 --- a/tests/integration/tests/4488-newer-cabal-version/files/stack-good.yaml +++ b/tests/integration/tests/4488-newer-cabal-version/files/stack-good.yaml @@ -1,3 +1,3 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 extra-deps: - Cabal-2.4.1.0 diff --git a/tests/integration/tests/4754-rebuild-haddocks/files/stack.yaml b/tests/integration/tests/4754-rebuild-haddocks/files/stack.yaml index 4de2aff65a..e674eab75a 100644 --- a/tests/integration/tests/4754-rebuild-haddocks/files/stack.yaml +++ b/tests/integration/tests/4754-rebuild-haddocks/files/stack.yaml @@ -1 +1 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 diff --git a/tests/integration/tests/4783-doctest-deps/files/snapshot.yaml b/tests/integration/tests/4783-doctest-deps/files/snapshot.yaml index 98df21163b..d8846f7140 100644 --- a/tests/integration/tests/4783-doctest-deps/files/snapshot.yaml +++ b/tests/integration/tests/4783-doctest-deps/files/snapshot.yaml @@ -1,4 +1,4 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 name: foo packages: - acme-dont-1.1@sha256:8264ad3e5113d3e0417b46e71d5a9c0914a1f03b5b81319cc329f1dc0f49b96c,602 diff --git a/tests/integration/tests/4897-boot-package-pruned/files/stack.yaml b/tests/integration/tests/4897-boot-package-pruned/files/stack.yaml index 5e4b4d926b..7e856949fa 100644 --- a/tests/integration/tests/4897-boot-package-pruned/files/stack.yaml +++ b/tests/integration/tests/4897-boot-package-pruned/files/stack.yaml @@ -1,3 +1,3 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 extra-deps: - ./directory diff --git a/tests/integration/tests/4938-non-ascii-module-names/files/stack.yaml b/tests/integration/tests/4938-non-ascii-module-names/files/stack.yaml index 7295acde5f..bee1e9b7f5 100644 --- a/tests/integration/tests/4938-non-ascii-module-names/files/stack.yaml +++ b/tests/integration/tests/4938-non-ascii-module-names/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 diff --git a/tests/integration/tests/5180-ghc-rts-flags/files/stack.yaml b/tests/integration/tests/5180-ghc-rts-flags/files/stack.yaml index 425014eb93..902467bb3b 100644 --- a/tests/integration/tests/5180-ghc-rts-flags/files/stack.yaml +++ b/tests/integration/tests/5180-ghc-rts-flags/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 ghc-options: "$locals": -j8 +RTS -s -A128M diff --git a/tests/integration/tests/5272-only-locals/files/stack.yaml b/tests/integration/tests/5272-only-locals/files/stack.yaml index 7454fcff05..63cbffa4be 100644 --- a/tests/integration/tests/5272-only-locals/files/stack.yaml +++ b/tests/integration/tests/5272-only-locals/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 extra-deps: - unliftio-core-0.2.0.1@sha256:f9abcdd3f3d28e4840563efb7b8760d2de9b5707bcd6f53a87f6a0d77bb5a9f7,1082 # Force a unique snapshot diff --git a/tests/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml b/tests/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml index 2a872dbff4..10fa8f74ac 100644 --- a/tests/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml +++ b/tests/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml @@ -1,4 +1,4 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 packages: - . - ../package-c diff --git a/tests/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml b/tests/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml index 2a872dbff4..10fa8f74ac 100644 --- a/tests/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml +++ b/tests/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml @@ -1,4 +1,4 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 packages: - . - ../package-c diff --git a/tests/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml b/tests/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml index 7295acde5f..bee1e9b7f5 100644 --- a/tests/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml +++ b/tests/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml @@ -1 +1 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 diff --git a/tests/integration/tests/6046-missing-sublib-unregister/files/stack.yaml b/tests/integration/tests/6046-missing-sublib-unregister/files/stack.yaml index 7295acde5f..bee1e9b7f5 100644 --- a/tests/integration/tests/6046-missing-sublib-unregister/files/stack.yaml +++ b/tests/integration/tests/6046-missing-sublib-unregister/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 diff --git a/tests/integration/tests/606-local-version-not-exist/files/stack.yaml b/tests/integration/tests/606-local-version-not-exist/files/stack.yaml index 7295acde5f..bee1e9b7f5 100644 --- a/tests/integration/tests/606-local-version-not-exist/files/stack.yaml +++ b/tests/integration/tests/606-local-version-not-exist/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 diff --git a/tests/integration/tests/617-extra-dep-flag/files/stack.yaml b/tests/integration/tests/617-extra-dep-flag/files/stack.yaml index d52afc4c78..33622a7c88 100644 --- a/tests/integration/tests/617-extra-dep-flag/files/stack.yaml +++ b/tests/integration/tests/617-extra-dep-flag/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 flags: text: integer-simple: false diff --git a/tests/integration/tests/617-unused-flag-cli/files/stack.yaml b/tests/integration/tests/617-unused-flag-cli/files/stack.yaml index 4de2aff65a..e674eab75a 100644 --- a/tests/integration/tests/617-unused-flag-cli/files/stack.yaml +++ b/tests/integration/tests/617-unused-flag-cli/files/stack.yaml @@ -1 +1 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 diff --git a/tests/integration/tests/617-unused-flag-name-yaml/files/stack.yaml b/tests/integration/tests/617-unused-flag-name-yaml/files/stack.yaml index f9a2da2dd1..39fe9b5749 100644 --- a/tests/integration/tests/617-unused-flag-name-yaml/files/stack.yaml +++ b/tests/integration/tests/617-unused-flag-name-yaml/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 flags: files: does-not-exist: false diff --git a/tests/integration/tests/617-unused-flag-yaml/files/stack.yaml b/tests/integration/tests/617-unused-flag-yaml/files/stack.yaml index 661bdec8ad..d17c443bee 100644 --- a/tests/integration/tests/617-unused-flag-yaml/files/stack.yaml +++ b/tests/integration/tests/617-unused-flag-yaml/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 flags: does-not-exist: foo: false diff --git a/tests/integration/tests/620-env-command/files/run.sh b/tests/integration/tests/620-env-command/files/run.sh index bb7435b067..7191140af8 100644 --- a/tests/integration/tests/620-env-command/files/run.sh +++ b/tests/integration/tests/620-env-command/files/run.sh @@ -2,6 +2,6 @@ set -euxo pipefail -stack build --resolver lts-24.9 async -eval `stack config env --resolver lts-24.9` +stack build --resolver lts-24.18 async +eval `stack config env --resolver lts-24.18` ghc Main.hs diff --git a/tests/integration/tests/6372-sdist-unicode-test/files/stack.yaml b/tests/integration/tests/6372-sdist-unicode-test/files/stack.yaml index 7295acde5f..bee1e9b7f5 100644 --- a/tests/integration/tests/6372-sdist-unicode-test/files/stack.yaml +++ b/tests/integration/tests/6372-sdist-unicode-test/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 diff --git a/tests/integration/tests/6465-msys-environment/files/stack.yaml b/tests/integration/tests/6465-msys-environment/files/stack.yaml index 8445baad21..a3bacf5446 100644 --- a/tests/integration/tests/6465-msys-environment/files/stack.yaml +++ b/tests/integration/tests/6465-msys-environment/files/stack.yaml @@ -1,2 +1,2 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 msys-environment: UCRT64 diff --git a/tests/integration/tests/717-sdist-test/files/stack.yaml b/tests/integration/tests/717-sdist-test/files/stack.yaml index 139ca99963..fe038c8c9b 100644 --- a/tests/integration/tests/717-sdist-test/files/stack.yaml +++ b/tests/integration/tests/717-sdist-test/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 packages: - package-with-th - package-with-working-th diff --git a/tests/integration/tests/763-buildable-false/files/stack.yaml b/tests/integration/tests/763-buildable-false/files/stack.yaml index 7295acde5f..bee1e9b7f5 100644 --- a/tests/integration/tests/763-buildable-false/files/stack.yaml +++ b/tests/integration/tests/763-buildable-false/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 diff --git a/tests/integration/tests/796-ghc-options/files/stack.yaml b/tests/integration/tests/796-ghc-options/files/stack.yaml index 91dc03d4fd..f98d2f0900 100644 --- a/tests/integration/tests/796-ghc-options/files/stack.yaml +++ b/tests/integration/tests/796-ghc-options/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 ghc-options: "*": -DFOO ghc-options: -DBAR diff --git a/tests/integration/tests/allow-newer-specific-packages/files/stack.yaml b/tests/integration/tests/allow-newer-specific-packages/files/stack.yaml index 44be6b9e95..b2dcb88d9a 100644 --- a/tests/integration/tests/allow-newer-specific-packages/files/stack.yaml +++ b/tests/integration/tests/allow-newer-specific-packages/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 allow-newer: true allow-newer-deps: diff --git a/tests/integration/tests/cabal-non-buildable-bug/Main.hs b/tests/integration/tests/cabal-non-buildable-bug/Main.hs index 529a9d52ff..72d7107933 100644 --- a/tests/integration/tests/cabal-non-buildable-bug/Main.hs +++ b/tests/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" "snapshot: lts-24.9" + writeFile "stack.yaml" "snapshot: lts-24.18" stack ["build", "--dry-run"] stack ["build"] diff --git a/tests/integration/tests/cabal-sublibrary-dependency/Main.hs b/tests/integration/tests/cabal-sublibrary-dependency/Main.hs index 8b10f83e71..da62ff8f13 100644 --- a/tests/integration/tests/cabal-sublibrary-dependency/Main.hs +++ b/tests/integration/tests/cabal-sublibrary-dependency/Main.hs @@ -9,5 +9,5 @@ import StackTest main :: IO () -- 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.10.2.) +-- (See stack.yaml; using GHC 9.10.3.) main = stack ["build", "--install-ghc"] diff --git a/tests/integration/tests/cabal-sublibrary-dependency/files/stack.yaml b/tests/integration/tests/cabal-sublibrary-dependency/files/stack.yaml index 77df40df3d..7c8dae71ea 100644 --- a/tests/integration/tests/cabal-sublibrary-dependency/files/stack.yaml +++ b/tests/integration/tests/cabal-sublibrary-dependency/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 packages: - . - subproject diff --git a/tests/integration/tests/copy-bins-works/files/stack.yaml b/tests/integration/tests/copy-bins-works/files/stack.yaml index 8d25e695e3..af66d8f381 100644 --- a/tests/integration/tests/copy-bins-works/files/stack.yaml +++ b/tests/integration/tests/copy-bins-works/files/stack.yaml @@ -1,2 +1,2 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 copy-bins: true diff --git a/tests/integration/tests/drop-packages/files/stack.yaml b/tests/integration/tests/drop-packages/files/stack.yaml index aa5b74b448..ee282a9f78 100644 --- a/tests/integration/tests/drop-packages/files/stack.yaml +++ b/tests/integration/tests/drop-packages/files/stack.yaml @@ -1,3 +1,3 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 drop-packages: - unliftio-core diff --git a/tests/integration/tests/duplicate-package-ids/files/stack1.yaml b/tests/integration/tests/duplicate-package-ids/files/stack1.yaml index f647817005..5c8a0486fe 100644 --- a/tests/integration/tests/duplicate-package-ids/files/stack1.yaml +++ b/tests/integration/tests/duplicate-package-ids/files/stack1.yaml @@ -1,2 +1,2 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 packages: [] diff --git a/tests/integration/tests/duplicate-package-ids/files/stack2.yaml b/tests/integration/tests/duplicate-package-ids/files/stack2.yaml index bcc3b2b69c..80a4d1c98e 100644 --- a/tests/integration/tests/duplicate-package-ids/files/stack2.yaml +++ b/tests/integration/tests/duplicate-package-ids/files/stack2.yaml @@ -1,3 +1,3 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 packages: - auto-update-0.1.2.1 diff --git a/tests/integration/tests/ghc-install-hooks/files/run.sh b/tests/integration/tests/ghc-install-hooks/files/run.sh index 36aba22a44..7fdbe39f94 100644 --- a/tests/integration/tests/ghc-install-hooks/files/run.sh +++ b/tests/integration/tests/ghc-install-hooks/files/run.sh @@ -2,7 +2,7 @@ set -exu -stack_bin=$("$STACK_EXE" path --resolver ghc-9.10.2 --compiler-bin) +stack_bin=$("$STACK_EXE" path --resolver ghc-9.10.3 --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.10.2 ghc -- --info -"$STACK_EXE" --no-install-ghc --resolver ghc-9.10.2 runghc foo.hs +"$STACK_EXE" --no-install-ghc --resolver ghc-9.10.3 ghc -- --info +"$STACK_EXE" --no-install-ghc --resolver ghc-9.10.3 runghc foo.hs diff --git a/tests/integration/tests/haddock-options/files/stack.yaml b/tests/integration/tests/haddock-options/files/stack.yaml index f581359ad9..c16300f7d1 100644 --- a/tests/integration/tests/haddock-options/files/stack.yaml +++ b/tests/integration/tests/haddock-options/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 build: haddock-arguments: diff --git a/tests/integration/tests/hpack-repo/files/stack.yaml b/tests/integration/tests/hpack-repo/files/stack.yaml index 8f8600aae8..2d1f7fcdf9 100644 --- a/tests/integration/tests/hpack-repo/files/stack.yaml +++ b/tests/integration/tests/hpack-repo/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 extra-deps: - git: https://github.com/NorfairKing/validity.git commit: d128cc30bc886e31ea7f8161fb7708c08b162937 diff --git a/tests/integration/tests/init-omit-packages/Main.hs b/tests/integration/tests/init-omit-packages/Main.hs index 6742df1f5a..4005fd861e 100644 --- a/tests/integration/tests/init-omit-packages/Main.hs +++ b/tests/integration/tests/init-omit-packages/Main.hs @@ -5,8 +5,8 @@ import System.IO (readFile) main :: IO () main = do removeFileIgnore "stack.yaml" - stackErr ["init", "--snapshot", "lts-24.9"] - stack ["init", "--snapshot", "lts-24.9", "--omit-packages"] + stackErr ["init", "--snapshot", "lts-24.18"] + stack ["init", "--snapshot", "lts-24.18", "--omit-packages"] contents <- lines <$> readFile "stack.yaml" unless ("#- bad" `elem` contents) $ error "commented out 'bad' package was expected" diff --git a/tests/integration/tests/internal-libraries/files/stack.yaml b/tests/integration/tests/internal-libraries/files/stack.yaml index 4de2aff65a..e674eab75a 100644 --- a/tests/integration/tests/internal-libraries/files/stack.yaml +++ b/tests/integration/tests/internal-libraries/files/stack.yaml @@ -1 +1 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 diff --git a/tests/integration/tests/lock-files/files/stack-1-extra b/tests/integration/tests/lock-files/files/stack-1-extra index 7802a60b37..5dc1cea078 100644 --- a/tests/integration/tests/lock-files/files/stack-1-extra +++ b/tests/integration/tests/lock-files/files/stack-1-extra @@ -1,3 +1,3 @@ -resolver: lts-24.9 +resolver: lts-24.18 extra-deps: - acme-cuteboy-0.1.0.0 diff --git a/tests/integration/tests/lock-files/files/stack-2-extras b/tests/integration/tests/lock-files/files/stack-2-extras index ca6c4056f5..279118eec2 100644 --- a/tests/integration/tests/lock-files/files/stack-2-extras +++ b/tests/integration/tests/lock-files/files/stack-2-extras @@ -1,4 +1,4 @@ -resolver: lts-24.9 +resolver: lts-24.18 extra-deps: - acme-cuteboy-0.1.0.0 - acme-dont-1.1 diff --git a/tests/integration/tests/module-added-multiple-times/files/stack.yaml b/tests/integration/tests/module-added-multiple-times/files/stack.yaml index 7295acde5f..bee1e9b7f5 100644 --- a/tests/integration/tests/module-added-multiple-times/files/stack.yaml +++ b/tests/integration/tests/module-added-multiple-times/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 diff --git a/tests/integration/tests/multi-test/files/stack.yaml b/tests/integration/tests/multi-test/files/stack.yaml index 09b8c94a1e..b5e5b3e4a8 100644 --- a/tests/integration/tests/multi-test/files/stack.yaml +++ b/tests/integration/tests/multi-test/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 packages: - . - sub-package diff --git a/tests/integration/tests/mutable-deps/files/stack.yaml b/tests/integration/tests/mutable-deps/files/stack.yaml index 9b75bb20c1..c4209ea5cc 100644 --- a/tests/integration/tests/mutable-deps/files/stack.yaml +++ b/tests/integration/tests/mutable-deps/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 extra-deps: - ./filepath-1.5.4.0 # Required, otherwise Stack reports that GHC boot library has been pruned. diff --git a/tests/integration/tests/nice-resolver-names/Main.hs b/tests/integration/tests/nice-resolver-names/Main.hs index 4664b97145..f4e30ad651 100644 --- a/tests/integration/tests/nice-resolver-names/Main.hs +++ b/tests/integration/tests/nice-resolver-names/Main.hs @@ -8,7 +8,7 @@ import Data.List (stripPrefix) main :: IO () main = do - for_ ["lts-20.26", "lts-24.9"] $ \snapshot -> do + for_ ["lts-20.26", "lts-24.18"] $ \snapshot -> do stack ["init", "--force", "--snapshot", snapshot] str <- readFile "stack.yaml" case mapMaybe (stripPrefix "snapshot: ") $ lines str of diff --git a/tests/integration/tests/no-rerun-tests/files/stack.yaml b/tests/integration/tests/no-rerun-tests/files/stack.yaml index 4de2aff65a..e674eab75a 100644 --- a/tests/integration/tests/no-rerun-tests/files/stack.yaml +++ b/tests/integration/tests/no-rerun-tests/files/stack.yaml @@ -1 +1 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 diff --git a/tests/integration/tests/override-compiler/Main.hs b/tests/integration/tests/override-compiler/Main.hs index a5892f54a2..961973e199 100644 --- a/tests/integration/tests/override-compiler/Main.hs +++ b/tests/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.10.2") $ error $ "Invalid version: " ++ show ver + unless (concat (lines ver) == "9.10.3") $ error $ "Invalid version: " ++ show ver diff --git a/tests/integration/tests/override-compiler/files/stack.yaml b/tests/integration/tests/override-compiler/files/stack.yaml index db1e2780c2..0b41c84c37 100644 --- a/tests/integration/tests/override-compiler/files/stack.yaml +++ b/tests/integration/tests/override-compiler/files/stack.yaml @@ -1,3 +1,3 @@ snapshot: lts-22.43 -compiler: ghc-9.10.2 +compiler: ghc-9.10.3 packages: [] diff --git a/tests/integration/tests/proper-rebuilds/files/stack.yaml b/tests/integration/tests/proper-rebuilds/files/stack.yaml index 4de2aff65a..e674eab75a 100644 --- a/tests/integration/tests/proper-rebuilds/files/stack.yaml +++ b/tests/integration/tests/proper-rebuilds/files/stack.yaml @@ -1 +1 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 diff --git a/tests/integration/tests/relative-script-snapshots/files/subdir/snapshot.yaml b/tests/integration/tests/relative-script-snapshots/files/subdir/snapshot.yaml index db08751e91..faccd3d5e8 100644 --- a/tests/integration/tests/relative-script-snapshots/files/subdir/snapshot.yaml +++ b/tests/integration/tests/relative-script-snapshots/files/subdir/snapshot.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 name: snapshot packages: - acme-missiles-0.3@rev:0 diff --git a/tests/integration/tests/script-extra-dep/files/script.hs b/tests/integration/tests/script-extra-dep/files/script.hs index 08afd49052..47c25c808b 100644 --- a/tests/integration/tests/script-extra-dep/files/script.hs +++ b/tests/integration/tests/script-extra-dep/files/script.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack --- stack --snapshot ghc-9.10.2 script --extra-dep acme-missiles-0.3@rev:0 --extra-dep stm-2.5.3.1@rev:1 +-- stack --snapshot ghc-9.10.3 script --extra-dep acme-missiles-0.3@rev:0 --extra-dep stm-2.5.3.1@rev:1 import Acme.Missiles main :: IO () diff --git a/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-extra-dep.yaml b/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-extra-dep.yaml index a27e7069ac..598233f978 100644 --- a/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-extra-dep.yaml +++ b/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-extra-dep.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 extra-deps: - async-2.1.1.1 - stm-2.1.2.2 diff --git a/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/snapshot.yaml b/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/snapshot.yaml index 6440b3cc31..f3b9e8c23d 100644 --- a/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/snapshot.yaml +++ b/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/snapshot.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.10.2 +snapshot: ghc-9.10.3 name: hackage-revisions-are-annoying packages: - async-2.1.1.1 diff --git a/tests/integration/tests/upload/files/stack.yaml b/tests/integration/tests/upload/files/stack.yaml index a993a031b6..adec139722 100644 --- a/tests/integration/tests/upload/files/stack.yaml +++ b/tests/integration/tests/upload/files/stack.yaml @@ -1,2 +1,2 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 hackage-base-url: http://localhost:12415/ diff --git a/tests/integration/tests/watched-files/files/stack.yaml b/tests/integration/tests/watched-files/files/stack.yaml index 7295acde5f..bee1e9b7f5 100644 --- a/tests/integration/tests/watched-files/files/stack.yaml +++ b/tests/integration/tests/watched-files/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-24.9 +snapshot: lts-24.18 diff --git a/tests/unit/Stack/ConfigSpec.hs b/tests/unit/Stack/ConfigSpec.hs index d4544c0200..72cc93ee4b 100644 --- a/tests/unit/Stack/ConfigSpec.hs +++ b/tests/unit/Stack/ConfigSpec.hs @@ -53,12 +53,12 @@ import Test.Hspec sampleConfig :: String sampleConfig = - "snapshot: lts-24.9\n" ++ + "snapshot: lts-24.18\n" ++ "packages: ['.']\n" buildOptsConfig :: String buildOptsConfig = - "snapshot: lts-24.9\n" ++ + "snapshot: lts-24.18\n" ++ "packages: ['.']\n" ++ "build:\n" ++ " library-profiling: true\n" ++ @@ -104,7 +104,7 @@ buildOptsConfig = buildOptsHaddockForHackageConfig :: String buildOptsHaddockForHackageConfig = - "snapshot: lts-24.9\n" ++ + "snapshot: lts-24.18\n" ++ "packages: ['.']\n" ++ "build:\n" ++ " haddock: true\n" ++ @@ -120,24 +120,24 @@ buildOptsHaddockForHackageConfig = hpackConfig :: String hpackConfig = - "snapshot: lts-24.9\n" ++ + "snapshot: lts-24.18\n" ++ "with-hpack: /usr/local/bin/hpack\n" ++ "packages: ['.']\n" resolverConfig :: String resolverConfig = - "resolver: lts-24.9\n" ++ + "resolver: lts-24.18\n" ++ "packages: ['.']\n" snapshotConfig :: String snapshotConfig = - "snapshot: lts-24.9\n" ++ + "snapshot: lts-24.18\n" ++ "packages: ['.']\n" resolverSnapshotConfig :: String resolverSnapshotConfig = - "resolver: lts-24.9\n" ++ - "snapshot: lts-24.9\n" ++ + "resolver: lts-24.18\n" ++ + "snapshot: lts-24.18\n" ++ "packages: ['.']\n" stackDotYaml :: Path Rel File @@ -187,11 +187,11 @@ spec = beforeAll setup $ do it "parses snapshot using 'resolver'" $ inTempDir $ do loadProject resolverConfig $ \project -> - project.snapshot `shouldBe` RSLSynonym (LTS 24 9) + project.snapshot `shouldBe` RSLSynonym (LTS 24 18) it "parses snapshot using 'snapshot'" $ inTempDir $ do loadProject snapshotConfig $ \project -> - project.snapshot `shouldBe` RSLSynonym (LTS 24 9) + project.snapshot `shouldBe` RSLSynonym (LTS 24 18) it "throws if both 'resolver' and 'snapshot' are present" $ inTempDir $ do loadProject resolverSnapshotConfig (const (pure ())) @@ -314,7 +314,7 @@ spec = beforeAll setup $ do packageYaml = childRel either impureThrow id (parseRelFile "package.yaml") createDirectoryIfMissing True $ toFilePath $ parent yamlAbs - writeFile (toFilePath yamlAbs) "snapshot: ghc-9.10.2" + writeFile (toFilePath yamlAbs) "snapshot: ghc-9.10.3" writeFile (toFilePath packageYaml) "name: foo" withEnvVar "STACK_YAML" (toFilePath yamlRel) $ loadConfig' $ \config -> liftIO $ do