From c95924cbf5d21272a19d9b4305561d0587988b7a Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Fri, 1 Dec 2023 20:34:40 +0000 Subject: [PATCH 1/2] Fix #6351 Move Stack to GHC 9.4.8 --- .devcontainer/devcontainer.json | 2 +- CONTRIBUTING.md | 2 +- ChangeLog.md | 2 +- cabal.config | 12 +++---- cabal.project | 4 +-- doc/GUIDE.md | 10 +++--- doc/Stack_and_VS_Code.md | 6 ++-- doc/custom_snapshot.md | 24 ++++++------- doc/faq.md | 6 ++-- doc/list_command.md | 6 ++-- doc/script_command.md | 4 +-- doc/scripts.md | 20 +++++------ doc/stack_yaml_vs_cabal_package_file.md | 4 +-- doc/yaml_configuration.md | 4 +-- etc/scripts/build-stack-installer.hs | 2 +- etc/scripts/release.hs | 6 ++-- src/Stack/Constants.hs | 8 ++--- src/Stack/Init.hs | 6 ++-- stack-ghc-9.6.3.yaml | 4 +-- stack-ghc-9.6.3.yaml.lock | 15 +++----- stack.yaml | 17 +++------ stack.yaml.lock | 36 +++---------------- tests/integration/lib/StackTest.hs | 2 +- .../files/my-snapshot.yaml | 2 +- .../files/snapshot-2.yaml | 2 +- .../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/my-snapshot.yaml | 2 +- .../files/custom1/custom1.yaml | 2 +- .../files/custom2/custom2.yaml | 2 +- .../345-override-bytestring/files/stack.yaml | 2 +- .../files/orig-stack.yaml | 2 +- .../3574-extra-dep-local/files/stack.yaml | 2 +- .../3591-cabal-warnings-once/files/stack.yaml | 2 +- .../365-invalid-success/files/stack.yaml | 2 +- .../tests/366-non-root-dir/files/stack.yaml | 2 +- .../370-invalid-setup-hs/files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../files/snapshot.yaml | 2 +- .../files/stack-bad.yaml | 2 +- .../tests/3863-purge-command/files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../files/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 | 8 ++--- .../4101-dependency-tree/files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../4215-missing-unregister/files/stack1.yaml | 2 +- .../4215-missing-unregister/files/stack2.yaml | 2 +- .../tests/4270-files-order/files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../tests/4390-dot-no-ghc/files/stack.yaml | 2 +- .../tests/4453-detailed/files/stack.yaml | 2 +- .../files/stack-bad.yaml | 2 +- .../files/stack-good.yaml | 2 +- .../4754-rebuild-haddocks/files/stack.yaml | 2 +- .../4783-doctest-deps/files/snapshot.yaml | 2 +- .../4897-boot-package-pruned/files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../tests/5180-ghc-rts-flags/files/stack.yaml | 2 +- .../tests/5272-only-locals/files/stack.yaml | 2 +- .../files/package-a/stack.yaml | 2 +- .../files/package-b/stack.yaml | 2 +- .../files/package-c/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../tests/617-extra-dep-flag/files/stack.yaml | 2 +- .../617-unused-flag-cli/files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../617-unused-flag-yaml/files/stack.yaml | 2 +- .../tests/620-env-command/files/run.sh | 4 +-- .../tests/717-sdist-test/files/stack.yaml | 2 +- .../763-buildable-false/files/stack.yaml | 2 +- .../tests/796-ghc-options/files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../tests/cabal-non-buildable-bug/Main.hs | 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 +- 127 files changed, 191 insertions(+), 237 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 6161653639..60ba92fc2d 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,7 +3,7 @@ "build": { "dockerfile": "GHC.Dockerfile", "args": { - "GHC_VERSION": "9.4.7", + "GHC_VERSION": "9.4.8", "HLS_VERSION": "2.4.0.0", "USE_ZSH_FOR_ROOT": "unset-to-use-ash", "SET_LANG": "C.UTF-8", diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2a8d53bc94..614710bad6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -569,7 +569,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.4.7. The tool is configured by the contents of the `.stan.toml` file. +GHC 9.4.8. The tool is configured by the contents of the `.stan.toml` file. This workflow will run if: diff --git a/ChangeLog.md b/ChangeLog.md index 35b4ab56df..7219679ff3 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -53,7 +53,7 @@ Other enhancements: `notify-if-cabal-untested` keys are introduced, to allow the notification to be muted if unwanted. * The compiler version is included in Stack's build message (e.g. - `stack> build (lib + exe + test) with ghc-9.4.7`). + `stack> build (lib + exe + test) with ghc-9.4.8`). Bug fixes: * Fix the `Curator` instance of `ToJSON`, as regards `expect-haddock-failure`. diff --git a/cabal.config b/cabal.config index 7789586a68..086e4b078c 100644 --- a/cabal.config +++ b/cabal.config @@ -22,7 +22,7 @@ constraints: , attoparsec-aeson ==2.1.0.0 , attoparsec-iso8601 ==1.1.0.0 , auto-update ==0.1.6 - , base ==4.17.2.0 + , base ==4.17.2.1 , base-compat ==0.12.3 , base-compat-batteries ==0.12.3 , base-orphans ==0.9.1 @@ -36,7 +36,7 @@ constraints: , blaze-html ==0.9.1.2 , blaze-markup ==0.8.3.0 , byteorder ==1.0.4 - , bytestring ==0.11.5.2 + , bytestring ==0.11.5.3 , casa-client ==0.0.2 , casa-types ==0.0.2 , case-insensitive ==1.2.1.0 @@ -81,8 +81,8 @@ constraints: , generic-deriving ==1.14.5 , generically ==0.1.1 , ghc-bignum ==1.3 - , ghc-boot ==9.4.7 - , ghc-boot-th ==9.4.7 + , ghc-boot ==9.4.8 + , ghc-boot-th ==9.4.8 , ghc-prim ==0.9.1 , githash ==0.1.7.0 , hackage-security ==0.6.2.3 @@ -93,7 +93,7 @@ constraints: , hpack ==0.36.0 , hpc ==0.6.1.0 , http-api-data ==0.5 - , http-client ==0.7.14 + , http-client ==0.7.15 , http-client-tls ==0.3.6.3 , http-conduit ==2.3.8.1 , http-download ==0.2.1.0 @@ -113,7 +113,7 @@ constraints: , microlens ==0.4.13.1 , microlens-mtl ==0.2.0.3 , microlens-th ==0.4.3.14 - , mime-types ==0.1.1.0 + , mime-types ==0.1.2.0 , mintty ==0.1.4 , monad-control ==1.0.3.1 , monad-logger ==0.3.40 diff --git a/cabal.project b/cabal.project index 72127b0ee7..1caee462cc 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-21.16/cabal.config. +-- https://www.stackage.org/lts-21.22/cabal.config. -- -with-compiler: ghc-9.4.7 +with-compiler: ghc-9.4.8 import: cabal.config packages: . diff --git a/doc/GUIDE.md b/doc/GUIDE.md index b00c9cf152..0d81e536ae 100644 --- a/doc/GUIDE.md +++ b/doc/GUIDE.md @@ -255,8 +255,8 @@ packages: The value of the `resolver` key tells Stack *how* to build your package: which GHC version to use, versions of package dependencies, and so on. Our value here -says to use [LTS Haskell 21.16](https://www.stackage.org/lts-21.16), which -implies GHC 9.4.7 (which is why `stack build` installs that version of GHC if it +says to use [LTS Haskell 21.22](https://www.stackage.org/lts-21.22), which +implies GHC 9.4.8 (which is why `stack build` installs that version of GHC if it is not already available to Stack). There are a number of values you can use for `resolver`, which we'll cover later. @@ -503,7 +503,7 @@ also known as *snapshots*. We mentioned the LTS resolvers, and you can get quite a bit of information about it at [https://www.stackage.org/lts](https://www.stackage.org/lts), including: -* The appropriate resolver value (`resolver: lts-21.16`, as is currently the +* The appropriate resolver value (`resolver: lts-21.22`, as is currently the latest LTS) * The GHC version used * A full list of all packages available in this snapshot @@ -522,7 +522,7 @@ towards by default as well). ## Resolvers and changing your compiler version -Let's explore package sets a bit further. Instead of `lts-21.16`, let's change +Let's explore package sets a bit further. Instead of `lts-21.22`, let's change our `stack.yaml` file to use the [latest nightly](https://www.stackage.org/nightly). Right now, this is currently 2023-09-24 - please see the resolver from the link above to get the latest. @@ -1340,7 +1340,7 @@ yields output like: ~~~text Run from outside a project, using implicit global project config -Using latest snapshot resolver: lts-21.16 +Using latest snapshot resolver: lts-21.22 Writing global (non-project-specific) config file to: /home/michael/.stack/global/stack.yaml Note: You can change the snapshot via the resolver field there. I installed the stm package via --package stm diff --git a/doc/Stack_and_VS_Code.md b/doc/Stack_and_VS_Code.md index 4fff15b442..27cc6d9d9a 100644 --- a/doc/Stack_and_VS_Code.md +++ b/doc/Stack_and_VS_Code.md @@ -75,9 +75,9 @@ enabled). For further information about these options, see the `install-ghc` For this workaround to work, each time that a resolver is used that references a different version of GHC, then GHCup must be used to install it (if GHCup has -not already installed that version). For example, to use `resolver: lts-21.16` -(GHC 9.4.7), the command `ghcup install ghc 9.4.7` must have been used to -install GHC 9.4.7. That may be a minor inconvenience for some people, as one the +not already installed that version). For example, to use `resolver: lts-21.22` +(GHC 9.4.8), the command `ghcup install ghc 9.4.8` must have been used to +install GHC 9.4.8. That may be a minor inconvenience for some people, as one the primary benefits of Stack over other Haskell build tools has been that Stack automatically ensures that the necessary version of GHC is available. diff --git a/doc/custom_snapshot.md b/doc/custom_snapshot.md index b26caff4ea..8db28ae0df 100644 --- a/doc/custom_snapshot.md +++ b/doc/custom_snapshot.md @@ -17,7 +17,7 @@ available in snapshots to ensure reproducibility. snapshot specification. ~~~yaml -resolver: lts-21.16 # Inherits GHC version and package set +resolver: lts-21.22 # Inherits GHC version and package set compiler: ghc-9.6.2 # Overwrites GHC version in the resolver, optional # Additional packages, follows extra-deps syntax @@ -61,35 +61,35 @@ custom snapshot, due to Stack sharing snapshot packages whenever possible. ### Overriding the compiler -The following snapshot specification will be identical to `lts-21.16`, but -instead use `ghc-9.4.5` instead of `ghc-9.4.7`: +The following snapshot specification will be identical to `lts-21.22`, but +instead use `ghc-9.4.5` instead of `ghc-9.4.8`: ~~~yaml -resolver: lts-21.16 +resolver: lts-21.22 compiler: ghc-9.4.5 ~~~ ### Dropping packages -The following snapshot specification will be identical to `lts-21.16`, but +The following snapshot specification will be identical to `lts-21.22`, but without the `text` package in our snapshot. Removing this package will cause all the packages that depend on `text` to be unbuildable, but they will still be present in the snapshot. ~~~yaml -resolver: lts-21.16 +resolver: lts-21.22 drop-packages: - text ~~~ ### Hiding packages -The following snapshot specification will be identical to `lts-21.16`, but the +The following snapshot specification will be identical to `lts-21.22`, but the `text` package will be hidden when registering. This will affect, for example, the import parser in the script command. ~~~yaml -resolver: lts-21.16 +resolver: lts-21.22 hidden: - text ~~~ @@ -99,11 +99,11 @@ hidden: In order to specify GHC options for a package, you use the same syntax as the [ghc-options](yaml_configuration.md#ghc-options) key for build configuration. -The following snapshot specification will be identical to `lts-21.16`, but +The following snapshot specification will be identical to `lts-21.22`, but provides `-O1` as a ghc-option for `text`: ~~~yaml -resolver: lts-21.16 +resolver: lts-21.22 packages: - text-2.0.2 ghc-options: @@ -122,11 +122,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](yaml_configuration.md#flags) key for build configuration. The -following snapshot specification will be identical to `lts-21.16`, but +following snapshot specification will be identical to `lts-21.22`, but it enables the `developer` Cabal flag: ~~~yaml -resolver: lts-21.16 +resolver: lts-21.22 packages: - text-2.0.2 flags: diff --git a/doc/faq.md b/doc/faq.md index ac48273676..1cb340b37a 100644 --- a/doc/faq.md +++ b/doc/faq.md @@ -9,7 +9,7 @@ here is to be as helpful and concise as possible. ## What version of GHC is used when I run something like `stack ghci`? The version of GHC, as well as which packages can be installed, are specified by -the _resolver_. This may be something like `lts-21.16`, which is from +the _resolver_. This may be something like `lts-21.22`, which is from [Stackage](https://www.stackage.org/). The [user's guide](GUIDE.md) discusses the resolver in more detail. @@ -76,7 +76,7 @@ You can make tweaks to a snapshot by modifying the `extra-deps` configuration value in your `stack.yaml` file, e.g.: ~~~yaml -resolver: lts-21.16 +resolver: lts-21.22 packages: - . extra-deps: @@ -91,7 +91,7 @@ Add it to the directory where your `stack.yaml` file lives, e.g. ~~~yaml -resolver: lts-21.16 +resolver: lts-21.22 packages: - . extra-deps: diff --git a/doc/list_command.md b/doc/list_command.md index 0f435ddfd2..acedac8709 100644 --- a/doc/list_command.md +++ b/doc/list_command.md @@ -44,17 +44,17 @@ Error: [S-4926] pantry, pretty, pasty, xattr, alloy, para, pappy, alure, polar and factory. -stack --resolver lts-21.16 list base unix Win32 acme-missiles pantry +stack --resolver lts-21.22 list base unix Win32 acme-missiles pantry Error: [S-4926] * Package does not appear in snapshot: base. * Package does not appear in snapshot: unix. * Package does not appear in snapshot: Win32. * Package does not appear in snapshot: acme-missiles. -stack --resolver lts-21.16 list pantry +stack --resolver lts-21.22 list pantry pantry-0.8.3 -stack --resolver lts-21.16 list +stack --resolver lts-21.22 list AC-Angle-1.0 ALUT-2.4.0.3 ... diff --git a/doc/script_command.md b/doc/script_command.md index 9d76b6efe3..eb3a26444c 100644 --- a/doc/script_command.md +++ b/doc/script_command.md @@ -18,7 +18,7 @@ configuration files (global and project-level). A snapshot must be specified on the command line (with the `--resolver` option). For example: ~~~text -stack script --resolver lts-21.16 MyScript.hs +stack script --resolver lts-21.22 MyScript.hs ~~~ The `stack script` command behaves as if the `--install-ghc` flag had been @@ -100,7 +100,7 @@ main = do can be compiled and run, with arguments, with: ~~~text -stack --resolver lts-21.16 script --package acme-missiles --compile MyScript.hs -- "Don't panic!" "Duck and cover!" +stack --resolver lts-21.22 script --package acme-missiles --compile MyScript.hs -- "Don't panic!" "Duck and cover!" ~~~ All the compilation outputs (like `Main.hi`, `Main.o`, and the executable diff --git a/doc/scripts.md b/doc/scripts.md index 934c1e39da..c36f3fdae5 100644 --- a/doc/scripts.md +++ b/doc/scripts.md @@ -19,7 +19,7 @@ An example will be easiest to understand. Consider the Haskell source file ~~~haskell #!/usr/bin/env stack --- stack script --resolver lts-21.16 --package turtle +-- stack script --resolver lts-21.22 --package turtle {-# LANGUAGE OverloadedStrings #-} import Turtle (echo) main = echo "Hello World!" @@ -78,10 +78,10 @@ able to reuse everything already built). The second line of the source code is the Stack interpreter options comment. In this example, it specifies the `stack script` command with the options of a -LTS Haskell 21.16 snapshot (`--resolver lts-21.16`) and ensuring the +LTS Haskell 21.22 snapshot (`--resolver lts-21.22`) and ensuring the [`turtle` package](https://hackage.haskell.org/package/turtle) is available (`--package turtle`). The version of the package will be that in the specified -snapshot (`lts-21.16` provides `turtle-1.6.1`). +snapshot (`lts-21.22` provides `turtle-1.6.1`). ## Arguments and interpreter options and arguments @@ -116,7 +116,7 @@ For example, the command `stack MyScript.hs arg1 arg2` with `MyScript.hs`: ~~~haskell #!/usr/bin/env stack {- stack script - --resolver lts-21.16 + --resolver lts-21.22 -- +RTS -s -RTS -} @@ -132,7 +132,7 @@ main = do is equivalent to the following command at the command line: ~~~text -stack script --resolver lts-21.16 -- MyScript.hs arg1 arg2 +RTS -s -RTS +stack script --resolver lts-21.22 -- MyScript.hs arg1 arg2 +RTS -s -RTS ~~~ where `+RTS -s -RTS` are some of GHC's @@ -161,7 +161,7 @@ space separated list. For example: ~~~haskell #!/usr/bin/env stack {- stack script - --resolver lts-21.16 + --resolver lts-21.22 --package turtle --package "stm async" --package http-client,http-conduit @@ -191,7 +191,7 @@ which makes use of the joke package ~~~haskell {- stack script - --resolver lts-21.16 + --resolver lts-21.22 --package acme-missiles -} import Acme.Missiles (launchMissiles) @@ -202,7 +202,7 @@ main = launchMissiles The command `stack --script-no-run-compile Script.hs` then behaves as if the command -`stack script --resolver lts-21.16 --package acme-missiles --no-run --compile -- Script.hs` +`stack script --resolver lts-21.22 --package acme-missiles --no-run --compile -- Script.hs` had been given. `Script.hs` is compiled (without optimisation) and the resulting executable is not run: no missiles are launched in the process! @@ -239,7 +239,7 @@ example with `runghc`: {- stack runghc --install-ghc - --resolver lts-21.16 + --resolver lts-21.22 --package base --package turtle -- @@ -262,7 +262,7 @@ it. Here is an example: {- stack exec ghci --install-ghc - --resolver lts-21.16 + --resolver lts-21.22 --package turtle -} ~~~ diff --git a/doc/stack_yaml_vs_cabal_package_file.md b/doc/stack_yaml_vs_cabal_package_file.md index 2056d47397..97793f5597 100644 --- a/doc/stack_yaml_vs_cabal_package_file.md +++ b/doc/stack_yaml_vs_cabal_package_file.md @@ -64,8 +64,8 @@ requires that you have chosen a specific version for each package available. The most common means by which this set of packages is defined is via a snapshot provided by Stackage. For example, if you go to the page -, you will see a list of 3,010 packages at -specific version numbers. When you then specify `resolver: lts-21.16`, you're +, you will see a list of 3,010 packages at +specific version numbers. When you then specify `resolver: lts-21.22`, you're telling Stack to use those package versions in resolving dependencies down to specific versions of packages. diff --git a/doc/yaml_configuration.md b/doc/yaml_configuration.md index 1bd4cf5295..8caebb0fd9 100644 --- a/doc/yaml_configuration.md +++ b/doc/yaml_configuration.md @@ -98,7 +98,7 @@ installation, and various settings like build flags. It is called a resolver since a snapshot states how dependencies are resolved. There are currently four resolver types: -* LTS Haskell snapshots, e.g. `resolver: lts-21.16` +* LTS Haskell snapshots, e.g. `resolver: lts-21.22` * Stackage Nightly snapshots, e.g. `resolver: nightly-2023-09-24` * No snapshot, just use packages shipped with the compiler. For GHC this looks like `resolver: ghc-9.6.2` @@ -614,7 +614,7 @@ resolvers like `ghc-9.6.2`. This can be used to override the compiler for a Stackage snapshot, like this: ~~~yaml -resolver: lts-21.16 +resolver: lts-21.22 compiler: ghc-9.6.2 compiler-check: match-exact ~~~ diff --git a/etc/scripts/build-stack-installer.hs b/etc/scripts/build-stack-installer.hs index d0118483f9..0002166c32 100644 --- a/etc/scripts/build-stack-installer.hs +++ b/etc/scripts/build-stack-installer.hs @@ -1,5 +1,5 @@ {- stack script - --resolver lts-21.16 + --resolver lts-21.22 --install-ghc --package nsis -} diff --git a/etc/scripts/release.hs b/etc/scripts/release.hs index 06fa2372ff..49a149880f 100644 --- a/etc/scripts/release.hs +++ b/etc/scripts/release.hs @@ -1,5 +1,5 @@ {- stack script - --resolver lts-21.16 + --resolver lts-21.22 --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 21.16 does not include boot packages --- directly. As GHC 9.4.7 boot packages Cabal and Cabal-syntax expose modules +-- the snapshot. Stackage LTS Haskell 21.22 does not include boot packages +-- directly. As GHC 9.4.8 boot packages Cabal and Cabal-syntax expose modules -- with the same names, the language extension PackageImports is required. {-# LANGUAGE PackageImports #-} diff --git a/src/Stack/Constants.hs b/src/Stack/Constants.hs index f03a195167..69f27dffc3 100644 --- a/src/Stack/Constants.hs +++ b/src/Stack/Constants.hs @@ -251,7 +251,7 @@ wiredInPackages = case mparsed of [ "ghc-prim" -- A magic package , "integer-gmp" - -- No longer magic > 1.0.3.0. With GHC 9.4.7 at least, there seems to be + -- No longer magic > 1.0.3.0. With GHC 9.4.8 at least, there seems to be -- no problem in using it. , "integer-simple" -- A magic package @@ -263,16 +263,16 @@ wiredInPackages = case mparsed of -- A magic package , "dph-seq" -- Deprecated in favour of dph-prim-seq, which does not appear to be - -- magic. With GHC 9.4.7 at least, there seems to be no problem in using + -- magic. With GHC 9.4.8 at least, there seems to be no problem in using -- it. , "dph-par" -- Deprecated in favour of dph-prim-par, which does not appear to be - -- magic. With GHC 9.4.7 at least, there seems to be no problem in using + -- magic. With GHC 9.4.8 at least, there seems to be no problem in using -- it. , "ghc" -- A magic package , "interactive" - -- Could not identify information about this package name. With GHC 9.4.7 + -- Could not identify information about this package name. With GHC 9.4.8 -- at least, there seems to be no problem in using it. , "ghc-bignum" -- A magic package diff --git a/src/Stack/Init.hs b/src/Stack/Init.hs index a7710cf5e7..dd44126e8d 100644 --- a/src/Stack/Init.hs +++ b/src/Stack/Init.hs @@ -422,9 +422,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:" , "" - , "resolver: lts-21.16" - , "resolver: nightly-2023-09-24" - , "resolver: ghc-9.6.2" + , "resolver: lts-21.22" + , "resolver: nightly-2023-12-01" + , "resolver: ghc-9.6.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/stack-ghc-9.6.3.yaml b/stack-ghc-9.6.3.yaml index 65a8b18dff..4764f3b682 100644 --- a/stack-ghc-9.6.3.yaml +++ b/stack-ghc-9.6.3.yaml @@ -2,14 +2,12 @@ # built with GHC 9.6.3. # GHC 9.6.3 -resolver: nightly-2023-11-04 +resolver: nightly-2023-12-01 extra-deps: # Cabal is pruned because process is a GHC boot package, and has to be specified # again. - Cabal-3.10.1.0@sha256:6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94,12316 -# nightly-2023-11-04 specifies hi-file-parser-0.1.5.0 -- hi-file-parser-0.1.6.0@sha256:3e9d4e346f32b24db5093c549458d9fd529cee7a94a28f3c7a4d40b232fcda6c,2850 # GHC 9.6.3 comes with process-1.6.17.0, which can segfault on macOS. - process-1.6.18.0@sha256:cd0a3e0376b5a8525983d3131a31e52f9ffefc278ce635eec45a9d3987b8be3e,3025 diff --git a/stack-ghc-9.6.3.yaml.lock b/stack-ghc-9.6.3.yaml.lock index 0ebc3e3cf0..2ea9c8c2a4 100644 --- a/stack-ghc-9.6.3.yaml.lock +++ b/stack-ghc-9.6.3.yaml.lock @@ -11,13 +11,6 @@ packages: size: 9223 original: hackage: Cabal-3.10.1.0@sha256:6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94,12316 -- completed: - hackage: hi-file-parser-0.1.6.0@sha256:3e9d4e346f32b24db5093c549458d9fd529cee7a94a28f3c7a4d40b232fcda6c,2850 - pantry-tree: - sha256: 7f7f370a95e095f5a0e992e5eae01d9ec6fa9ddc513b70aff0677efad9897f8a - size: 2393 - original: - hackage: hi-file-parser-0.1.6.0@sha256:3e9d4e346f32b24db5093c549458d9fd529cee7a94a28f3c7a4d40b232fcda6c,2850 - completed: hackage: process-1.6.18.0@sha256:cd0a3e0376b5a8525983d3131a31e52f9ffefc278ce635eec45a9d3987b8be3e,3025 pantry-tree: @@ -27,7 +20,7 @@ packages: hackage: process-1.6.18.0@sha256:cd0a3e0376b5a8525983d3131a31e52f9ffefc278ce635eec45a9d3987b8be3e,3025 snapshots: - completed: - sha256: bc10860c965faa1545615eab1bba5bd5a6f6d7d7b896a5f97e6ae8ff47ae192c - size: 698319 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/11/4.yaml - original: nightly-2023-11-04 + sha256: 67fe73117afa891e571896f6ac5eeda7aac34353bfaaa1f254779c05ebc09ae1 + size: 699421 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/12/1.yaml + original: nightly-2023-12-01 diff --git a/stack.yaml b/stack.yaml index 5a849663fa..000f1d5e62 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,9 +1,6 @@ -resolver: lts-21.16 # GHC 9.4.7 +resolver: lts-21.22 # GHC 9.4.8 extra-deps: -# Cabal is pruned because process is a GHC boot package, and has to be specified -# again. -- Cabal-3.8.1.0@sha256:77121d8e1aff14a0fd95684b751599db78a7dd26d55862d9fcef27c88b193e9d,12609 - aeson-warning-parser-0.1.0@sha256:f2c1c42b73aa35d352060abcbb867c410cbbf57d0cb0fed607bcd1e2a74954ad,1308 - ansi-terminal-1.0@sha256:640ffecfd95471388d939fcacb57bdc0cef15f0457746c234a12cdd5a6c6d1e8,2706 # Required because ansi-wl-pprint-0.6.9 specifies ansi-terminal < 0.12. See: @@ -16,26 +13,20 @@ extra-deps: - crypton-x509-store-1.6.9@sha256:422b9b9f87a7382c66385d047615b16fc86a68c08ea22b1e0117c143a2d44050,1750 - crypton-x509-system-1.6.7@sha256:023ed573d82983bc473a37a89e0434a085b413be9f68d07e085361056afd4637,1532 - crypton-x509-validation-1.6.12@sha256:85989721b64be4b90de9f66ef641c26f57575cffed1a50d707065fb60176f386,2227 -# lts-21.16 specifies hi-file-parser-0.1.5.0 -- hi-file-parser-0.1.6.0@sha256:3e9d4e346f32b24db5093c549458d9fd529cee7a94a28f3c7a4d40b232fcda6c,2850 -# lts-21.16 specifies hpack-0.35.2 +# lts-21.22 specifies hpack-0.35.2 - hpack-0.36.0@sha256:c2daa6556afc57367a5d1dbd878bf515d442d201e24b27473051359abd47ed08,5187 - http-client-tls-0.3.6.3@sha256:a5909ce412ee65c141b8547f8fe22236f175186c95c708e86a46b5547394f910,2046 - http-download-0.2.1.0@sha256:a97863e96f7d44efc3d0e3061db7fe2540b8374ca44ae90d0b56040140cb7506,1716 - optparse-applicative-0.18.1.0@sha256:b4cf8d9018e5e67cb1f14edb5130b6d05ad8bc1b5f6bd4efaa6ec0b7f28f559d,5132 - optparse-generic-1.5.1@sha256:c65a7d3429feedf870f5a9f7f0d2aaf75609888b52449f85f22871b5f5a7e95f,2204 - pantry-0.9.2@sha256:e1c5444d1b4003435d860853abd21e91e5fc337f2b2e2c8c992a2bac04712dc0,7650 -# lts-21.16 comes with path-0.9.2 -- path-0.9.5@sha256:3bdc437c4b120b90c222adf8324cbbe4fc35f7272a872dc4d003ea9292c56d1e,3273 -# GHC 9.4.7 comes with process-1.6.17.0, which can segfault on macOS. -- process-1.6.18.0@sha256:cd0a3e0376b5a8525983d3131a31e52f9ffefc278ce635eec45a9d3987b8be3e,3025 - static-bytes-0.1.0@sha256:35dbf30f617baa0151682c97687042516be07872a39984f9fe31f78125b962bf,1627 - tar-conduit-0.4.0@sha256:f333649770f5ec42a83a93b0d424cf6bb895d80dfbee05a54340395f81d036ae,3126 - tls-1.9.0@sha256:8ad332dc0224decb1b137bf6c9678b4f786487b9aaa5c9068cd3ad19d42c39a7,5571 docker: enable: false - repo: glcr.b-data.ch/ghc/ghc-musl:9.4.7 + repo: glcr.b-data.ch/ghc/ghc-musl:9.4.8 nix: # --nix on the command-line to enable. @@ -46,7 +37,7 @@ nix: flags: hackage-security: cabal-syntax: true - # GHC 9.4.7's boot library is Win32-2.12.0.1 + # GHC 9.4.8's boot library is Win32-2.12.0.1 mintty: win32-2-13-1: false stack: diff --git a/stack.yaml.lock b/stack.yaml.lock index 877e1c47b7..dbaeb14748 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -4,13 +4,6 @@ # https://docs.haskellstack.org/en/stable/lock_files packages: -- completed: - hackage: Cabal-3.8.1.0@sha256:77121d8e1aff14a0fd95684b751599db78a7dd26d55862d9fcef27c88b193e9d,12609 - pantry-tree: - sha256: 69af34caaaae2fa5ad24c69b7eead612b896d5c00d742d40ba0c1ae3ab6afd4f - size: 8955 - original: - hackage: Cabal-3.8.1.0@sha256:77121d8e1aff14a0fd95684b751599db78a7dd26d55862d9fcef27c88b193e9d,12609 - completed: hackage: aeson-warning-parser-0.1.0@sha256:f2c1c42b73aa35d352060abcbb867c410cbbf57d0cb0fed607bcd1e2a74954ad,1308 pantry-tree: @@ -81,13 +74,6 @@ packages: size: 639 original: hackage: crypton-x509-validation-1.6.12@sha256:85989721b64be4b90de9f66ef641c26f57575cffed1a50d707065fb60176f386,2227 -- completed: - hackage: hi-file-parser-0.1.6.0@sha256:3e9d4e346f32b24db5093c549458d9fd529cee7a94a28f3c7a4d40b232fcda6c,2850 - pantry-tree: - sha256: 7f7f370a95e095f5a0e992e5eae01d9ec6fa9ddc513b70aff0677efad9897f8a - size: 2393 - original: - hackage: hi-file-parser-0.1.6.0@sha256:3e9d4e346f32b24db5093c549458d9fd529cee7a94a28f3c7a4d40b232fcda6c,2850 - completed: hackage: hpack-0.36.0@sha256:c2daa6556afc57367a5d1dbd878bf515d442d201e24b27473051359abd47ed08,5187 pantry-tree: @@ -130,20 +116,6 @@ packages: size: 2665 original: hackage: pantry-0.9.2@sha256:e1c5444d1b4003435d860853abd21e91e5fc337f2b2e2c8c992a2bac04712dc0,7650 -- completed: - hackage: path-0.9.5@sha256:3bdc437c4b120b90c222adf8324cbbe4fc35f7272a872dc4d003ea9292c56d1e,3273 - pantry-tree: - sha256: 1eacdfa4e7c0aa278229a9548692fe1e95fb0a6b21ec0c9bd3a73cc0b50d4878 - size: 1206 - original: - hackage: path-0.9.5@sha256:3bdc437c4b120b90c222adf8324cbbe4fc35f7272a872dc4d003ea9292c56d1e,3273 -- completed: - hackage: process-1.6.18.0@sha256:cd0a3e0376b5a8525983d3131a31e52f9ffefc278ce635eec45a9d3987b8be3e,3025 - pantry-tree: - sha256: 3f9fef1f9a6ed1a6923578ada0bc8c16d016344cc67614473384524334463cc2 - size: 1675 - original: - hackage: process-1.6.18.0@sha256:cd0a3e0376b5a8525983d3131a31e52f9ffefc278ce635eec45a9d3987b8be3e,3025 - completed: hackage: static-bytes-0.1.0@sha256:35dbf30f617baa0151682c97687042516be07872a39984f9fe31f78125b962bf,1627 pantry-tree: @@ -167,7 +139,7 @@ packages: hackage: tls-1.9.0@sha256:8ad332dc0224decb1b137bf6c9678b4f786487b9aaa5c9068cd3ad19d42c39a7,5571 snapshots: - completed: - sha256: 1d663bec402f77fa09fa3e8cf288c3c7eb18a1f28a5e0c331ac47adeacd21346 - size: 640034 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/16.yaml - original: lts-21.16 + sha256: afd5ba64ab602cabc2d3942d3d7e7dd6311bc626dcb415b901eaf576cb62f0ea + size: 640060 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/22.yaml + original: lts-21.22 diff --git a/tests/integration/lib/StackTest.hs b/tests/integration/lib/StackTest.hs index decab10547..bbfe2eab37 100644 --- a/tests/integration/lib/StackTest.hs +++ b/tests/integration/lib/StackTest.hs @@ -363,7 +363,7 @@ isMacOSX = os == "darwin" -- the main @stack.yaml@. -- defaultResolverArg :: String -defaultResolverArg = "--resolver=lts-21.16" +defaultResolverArg = "--resolver=lts-21.22" -- | 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 5c54ccc2d8..e9678f91d2 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.4.7 +compiler: ghc-9.4.8 name: my-snapshot packages: - mtl-2.2.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 51c48b4554..a25549d424 100644 --- a/tests/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml +++ b/tests/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 name: test-snapshot-2 packages: - stm-2.5.1.0 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 8b4d29c6a4..69ab871341 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 @@ -resolver: lts-21.16 +resolver: lts-21.22 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 67478403ae..b7469a4710 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,5 +1,5 @@ --- -resolver: lts-21.16 +resolver: lts-21.22 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 14fd5e33b5..9dc225ae36 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,5 +1,5 @@ --- -resolver: lts-21.16 +resolver: lts-21.22 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 ff77392d7a..e25de711b4 100644 --- a/tests/integration/tests/1337-unicode-everywhere/files/stack.yaml +++ b/tests/integration/tests/1337-unicode-everywhere/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-21.16 +resolver: lts-21.22 packages: - '.' extra-deps: [] 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 31e40306ff..7285dc2ebc 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 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 168961ef71..3341a54c13 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 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 8fc7b817b5..78123e3812 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 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 6c7eba21ed..5e28f94b8d 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 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 ff77392d7a..e25de711b4 100644 --- a/tests/integration/tests/1659-skip-component/files/stack.yaml +++ b/tests/integration/tests/1659-skip-component/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-21.16 +resolver: lts-21.22 packages: - '.' extra-deps: [] 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 1239c5656d..29b3cda6fb 100644 --- a/tests/integration/tests/1884-url-to-tarball/files/stack.yaml +++ b/tests/integration/tests/1884-url-to-tarball/files/stack.yaml @@ -2,4 +2,4 @@ extra-deps: - location: https://hackage.haskell.org/package/half-0.2.2.3/half-0.2.2.3.tar.gz sha256: 85c244c80d1c889a3d79073a6f5a99d9e769dbe3c574ca11d992b2b4f7599a5c size: 6050 -resolver: lts-21.16 +resolver: lts-21.22 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 29dbc9550f..f5fab4d8a4 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 @@ -resolver: lts-21.16 +resolver: lts-21.22 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 a05e2f888c..4eb202a0b7 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.4.7 --compiler-bin):$PATH +export PATH=$(pwd)/fake-path:$("$STACK_EXE" path --resolver ghc-9.4.8 --compiler-bin):$PATH export STACK_ROOT=$(pwd)/fake-root which ghc -"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.4.7 ghc -- --info -"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.4.7 runghc foo.hs +"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.4.8 ghc -- --info +"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.4.8 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 37c52e6d5c..32e183acdc 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 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 483b3fde53..c294d24899 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 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 b7a47580b2..0623f7c8a2 100644 --- a/tests/integration/tests/32-unlisted-module/files/stack.yaml +++ b/tests/integration/tests/32-unlisted-module/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-21.16 +resolver: lts-21.22 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 1b881fed53..3ead15e405 100644 --- a/tests/integration/tests/3315-multi-ghc-options/files/stack.yaml +++ b/tests/integration/tests/3315-multi-ghc-options/files/stack.yaml @@ -1,3 +1,3 @@ -resolver: lts-21.16 +resolver: lts-21.22 packages: - '.' 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 b7a47580b2..0623f7c8a2 100644 --- a/tests/integration/tests/335-multi-package-flags/files/stack.yaml +++ b/tests/integration/tests/335-multi-package-flags/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-21.16 +resolver: lts-21.22 diff --git a/tests/integration/tests/3390-unbuildable-test/files/stack.yaml b/tests/integration/tests/3390-unbuildable-test/files/stack.yaml index 278a3ea74d..7b6af6cf42 100644 --- a/tests/integration/tests/3390-unbuildable-test/files/stack.yaml +++ b/tests/integration/tests/3390-unbuildable-test/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 diff --git a/tests/integration/tests/3396-package-indices/files/my-snapshot.yaml b/tests/integration/tests/3396-package-indices/files/my-snapshot.yaml index 8f6b9012a1..8c6f076ac8 100644 --- a/tests/integration/tests/3396-package-indices/files/my-snapshot.yaml +++ b/tests/integration/tests/3396-package-indices/files/my-snapshot.yaml @@ -1,4 +1,4 @@ -compiler: ghc-9.4.7 +compiler: ghc-9.4.8 name: my-snapshot packages: 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 7d6bdec7ee..0c3e5c7853 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 name: custom1 packages: - stm-2.5.0.0 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 83a705c7ac..685cdd9b74 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 name: custom2 packages: - stm-2.5.0.0 diff --git a/tests/integration/tests/345-override-bytestring/files/stack.yaml b/tests/integration/tests/345-override-bytestring/files/stack.yaml index 79ce07f068..181e95a977 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 @@ -resolver: lts-21.16 +resolver: lts-21.22 extra-deps: - bytestring-0.11.3.1 - 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 5349224233..580f4e6dec 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 @@ -resolver: lts-21.16 +resolver: lts-21.22 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 236fe6a75a..fbed3e1306 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 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 29dbc9550f..f5fab4d8a4 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 @@ -resolver: lts-21.16 +resolver: lts-21.22 diff --git a/tests/integration/tests/365-invalid-success/files/stack.yaml b/tests/integration/tests/365-invalid-success/files/stack.yaml index b7a47580b2..0623f7c8a2 100644 --- a/tests/integration/tests/365-invalid-success/files/stack.yaml +++ b/tests/integration/tests/365-invalid-success/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-21.16 +resolver: lts-21.22 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 b7a47580b2..0623f7c8a2 100644 --- a/tests/integration/tests/366-non-root-dir/files/stack.yaml +++ b/tests/integration/tests/366-non-root-dir/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-21.16 +resolver: lts-21.22 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 278a3ea74d..7b6af6cf42 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 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 29dbc9550f..f5fab4d8a4 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 @@ -resolver: lts-21.16 +resolver: lts-21.22 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 f846254614..c88c923c50 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 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 6a6b54e3a8..75112b1906 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 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 b7a47580b2..0623f7c8a2 100644 --- a/tests/integration/tests/3863-purge-command/files/stack.yaml +++ b/tests/integration/tests/3863-purge-command/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-21.16 +resolver: lts-21.22 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 aa8f94e99f..0baac20395 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 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 66c5ea3111..a843c8b907 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 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 6bc1c6bd62..207b0f3071 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 @@ -resolver: lts-21.16 +resolver: lts-21.22 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 29dbc9550f..f5fab4d8a4 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 @@ -resolver: lts-21.16 +resolver: lts-21.22 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 c13d7b448d..33ea97db87 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-21.16 +resolver: lts-21.22 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 29dbc9550f..f5fab4d8a4 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 @@ -resolver: lts-21.16 +resolver: lts-21.22 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 29dbc9550f..f5fab4d8a4 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 @@ -resolver: lts-21.16 +resolver: lts-21.22 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 aa8f94e99f..0baac20395 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 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 29dbc9550f..f5fab4d8a4 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 @@ -resolver: lts-21.16 +resolver: lts-21.22 diff --git a/tests/integration/tests/4001-excess-recompilation/files/stack.yaml b/tests/integration/tests/4001-excess-recompilation/files/stack.yaml index 278a3ea74d..7b6af6cf42 100644 --- a/tests/integration/tests/4001-excess-recompilation/files/stack.yaml +++ b/tests/integration/tests/4001-excess-recompilation/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 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 d6611a8e07..161b197f0d 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 @@ build: test-arguments: no-run-tests: true -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 diff --git a/tests/integration/tests/4101-dependency-tree/Main.hs b/tests/integration/tests/4101-dependency-tree/Main.hs index 9dafcf990b..2e03c988c5 100644 --- a/tests/integration/tests/4101-dependency-tree/Main.hs +++ b/tests/integration/tests/4101-dependency-tree/Main.hs @@ -12,7 +12,7 @@ main = stackCheckStdout ["ls", "dependencies", "tree"] $ \stdOut -> do let expected = unlines [ "Packages" , "├─┬ files 0.1.0.0" - , "│ ├─┬ base 4.17.2.0" + , "│ ├─┬ base 4.17.2.1" ] unless (expected `isPrefixOf` stdOut) $ error $ unlines [ "Expected:", expected, "Actual:", stdOut ] @@ -20,12 +20,12 @@ main = stackCheckStdout ["ls", "dependencies", "tree", "--depth=1"] $ \stdOut -> do let expected = unlines [ "Packages" , "├─┬ files 0.1.0.0" - , "│ ├── base 4.17.2.0" + , "│ ├── base 4.17.2.1" , "│ ├── filelock 0.1.1.2" , "│ ├── mtl 2.2.2" , "│ └── subproject 0.1.0.0" , "└─┬ subproject 0.1.0.0" - , " └── base 4.17.2.0" + , " └── base 4.17.2.1" ] when (stdOut /= expected) $ error $ unlines [ "Expected:", expected, "Actual:", stdOut ] @@ -33,7 +33,7 @@ main = stackCheckStdout ["ls", "dependencies", "tree", "subproject"] $ \stdOut -> do let expected = unlines [ "Packages" , "└─┬ subproject 0.1.0.0" - , " └─┬ base 4.17.2.0" + , " └─┬ base 4.17.2.1" , " ├─┬ ghc-bignum 1.3" , " │ └─┬ ghc-prim 0.9.1" , " │ └── 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 419f0085fa..053b63c489 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 @@ -resolver: lts-21.16 +resolver: lts-21.22 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 29dbc9550f..f5fab4d8a4 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 @@ -resolver: lts-21.16 +resolver: lts-21.22 diff --git a/tests/integration/tests/4215-missing-unregister/files/stack1.yaml b/tests/integration/tests/4215-missing-unregister/files/stack1.yaml index 71e69eb2ca..64193432af 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 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 16eacdd298..5a1e568d86 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 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 a78ba64749..8ddaab7980 100644 --- a/tests/integration/tests/4270-files-order/files/stack.yaml +++ b/tests/integration/tests/4270-files-order/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-21.16 +resolver: lts-21.22 packages: - . 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 278a3ea74d..7b6af6cf42 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 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 278a3ea74d..7b6af6cf42 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 diff --git a/tests/integration/tests/4453-detailed/files/stack.yaml b/tests/integration/tests/4453-detailed/files/stack.yaml index 1b881fed53..3ead15e405 100644 --- a/tests/integration/tests/4453-detailed/files/stack.yaml +++ b/tests/integration/tests/4453-detailed/files/stack.yaml @@ -1,3 +1,3 @@ -resolver: lts-21.16 +resolver: lts-21.22 packages: - '.' 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 278a3ea74d..7b6af6cf42 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 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 493bf13300..750823287e 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 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 278a3ea74d..7b6af6cf42 100644 --- a/tests/integration/tests/4754-rebuild-haddocks/files/stack.yaml +++ b/tests/integration/tests/4754-rebuild-haddocks/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 diff --git a/tests/integration/tests/4783-doctest-deps/files/snapshot.yaml b/tests/integration/tests/4783-doctest-deps/files/snapshot.yaml index 520b6cee3d..a468af5d0f 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 @@ -resolver: lts-21.16 +resolver: lts-21.22 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 4eb71351a8..f8c4758964 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 @@ -resolver: lts-21.16 +resolver: lts-21.22 packages: [.] 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 29dbc9550f..f5fab4d8a4 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 @@ -resolver: lts-21.16 +resolver: lts-21.22 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 221c9be4e6..03efb081b8 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 @@ -resolver: lts-21.16 +resolver: lts-21.22 packages: - . diff --git a/tests/integration/tests/5272-only-locals/files/stack.yaml b/tests/integration/tests/5272-only-locals/files/stack.yaml index 705f930cf3..8f4cd2d081 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 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 2d3cca5cf0..d933c766fb 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 @@ -resolver: lts-21.16 +resolver: lts-21.22 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 2d3cca5cf0..d933c766fb 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 @@ -resolver: lts-21.16 +resolver: lts-21.22 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 a622ae7f40..3b675af640 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,3 +1,3 @@ -resolver: lts-21.16 +resolver: lts-21.22 packages: - . 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 29dbc9550f..f5fab4d8a4 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 @@ -resolver: lts-21.16 +resolver: lts-21.22 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 b7a47580b2..0623f7c8a2 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 @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-21.16 +resolver: lts-21.22 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 c4663e15b5..643b354828 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 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 278a3ea74d..7b6af6cf42 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 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 c0a1714273..7ff18d2700 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 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 4430aa49c4..351c3ee3b6 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 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 d4d73d13e0..1cb81af791 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-21.16 async -eval `stack config env --resolver lts-21.16` +stack build --resolver lts-21.22 async +eval `stack config env --resolver lts-21.22` ghc Main.hs diff --git a/tests/integration/tests/717-sdist-test/files/stack.yaml b/tests/integration/tests/717-sdist-test/files/stack.yaml index 796e4621d5..f7601bc3ef 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 @@ -resolver: lts-21.16 +resolver: lts-21.22 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 b7a47580b2..0623f7c8a2 100644 --- a/tests/integration/tests/763-buildable-false/files/stack.yaml +++ b/tests/integration/tests/763-buildable-false/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-21.16 +resolver: lts-21.22 diff --git a/tests/integration/tests/796-ghc-options/files/stack.yaml b/tests/integration/tests/796-ghc-options/files/stack.yaml index 7bf1e13c1e..40e6efdc9b 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 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 fbedac0050..f133e31971 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 @@ -resolver: lts-21.16 +resolver: lts-21.22 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 73cdde7d41..e68cb86693 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" "resolver: lts-21.16" + writeFile "stack.yaml" "resolver: lts-21.22" 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 e0d04957b8..9af6bb4b3f 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.4.7.) +-- (See stack.yaml; using GHC 9.4.8.) 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 5f150452d7..8ae8191009 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 @@ -resolver: lts-21.16 # GHC 9.4.7 +resolver: lts-21.22 # GHC 9.4.8 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 a4e67f7b86..0dd0c625c1 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 copy-bins: true diff --git a/tests/integration/tests/drop-packages/files/stack.yaml b/tests/integration/tests/drop-packages/files/stack.yaml index 7cfb918cd4..c35e04570d 100644 --- a/tests/integration/tests/drop-packages/files/stack.yaml +++ b/tests/integration/tests/drop-packages/files/stack.yaml @@ -1,3 +1,3 @@ -resolver: lts-21.16 +resolver: lts-21.22 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 336d4f82c5..b04bd09e13 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 @@ -resolver: lts-21.16 +resolver: lts-21.22 packages: [] diff --git a/tests/integration/tests/duplicate-package-ids/files/stack2.yaml b/tests/integration/tests/duplicate-package-ids/files/stack2.yaml index 82ca736981..bbebb74bf4 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 @@ -resolver: lts-21.16 +resolver: lts-21.22 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 4613ca5989..93ac5dc857 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.4.7 --compiler-bin) +stack_bin=$("$STACK_EXE" path --resolver ghc-9.4.8 --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.4.7 ghc -- --info -"$STACK_EXE" --no-install-ghc --resolver ghc-9.4.7 runghc foo.hs +"$STACK_EXE" --no-install-ghc --resolver ghc-9.4.8 ghc -- --info +"$STACK_EXE" --no-install-ghc --resolver ghc-9.4.8 runghc foo.hs diff --git a/tests/integration/tests/haddock-options/files/stack.yaml b/tests/integration/tests/haddock-options/files/stack.yaml index 02a2a0cf07..5265893fdb 100644 --- a/tests/integration/tests/haddock-options/files/stack.yaml +++ b/tests/integration/tests/haddock-options/files/stack.yaml @@ -2,7 +2,7 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-21.16 +resolver: lts-21.22 build: haddock-arguments: haddock-args: diff --git a/tests/integration/tests/hpack-repo/files/stack.yaml b/tests/integration/tests/hpack-repo/files/stack.yaml index 58a6d2dbba..61ac1f3278 100644 --- a/tests/integration/tests/hpack-repo/files/stack.yaml +++ b/tests/integration/tests/hpack-repo/files/stack.yaml @@ -1,6 +1,6 @@ packages: - . -resolver: lts-21.16 +resolver: lts-21.22 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 1aa8e231a2..6b27279c76 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", "--resolver", "lts-21.16"] - stack ["init", "--resolver", "lts-21.16", "--omit-packages"] + stackErr ["init", "--resolver", "lts-21.22"] + stack ["init", "--resolver", "lts-21.22", "--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 663b9a584d..eb702785f4 100644 --- a/tests/integration/tests/internal-libraries/files/stack.yaml +++ b/tests/integration/tests/internal-libraries/files/stack.yaml @@ -17,4 +17,4 @@ # "Cabal-simple_SvXsv1f__3.2.1.0_ghc-8.10.7: Cannot build some foreign libraries: # Building foreign libraries is currently only supported on OSX, Linux and # Windows" -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 diff --git a/tests/integration/tests/lock-files/files/stack-1-extra b/tests/integration/tests/lock-files/files/stack-1-extra index a9aece69b4..e866817eff 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-21.16 +resolver: lts-21.22 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 1d2dc16d82..9c87efc15d 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-21.16 +resolver: lts-21.22 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 741a5066c6..51ca6eec6c 100644 --- a/tests/integration/tests/module-added-multiple-times/files/stack.yaml +++ b/tests/integration/tests/module-added-multiple-times/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-21.16 +resolver: lts-21.22 extra-deps: [] flags: {} extra-package-dbs: [] diff --git a/tests/integration/tests/multi-test/files/stack.yaml b/tests/integration/tests/multi-test/files/stack.yaml index b062166e0a..3b22388c43 100644 --- a/tests/integration/tests/multi-test/files/stack.yaml +++ b/tests/integration/tests/multi-test/files/stack.yaml @@ -4,4 +4,4 @@ packages: - sub-package - cyclic extra-deps: [] -resolver: lts-21.16 +resolver: lts-21.22 diff --git a/tests/integration/tests/mutable-deps/files/stack.yaml b/tests/integration/tests/mutable-deps/files/stack.yaml index 6c690c9e03..dba2cfb5b5 100644 --- a/tests/integration/tests/mutable-deps/files/stack.yaml +++ b/tests/integration/tests/mutable-deps/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-21.16 +resolver: lts-21.22 packages: - . extra-deps: diff --git a/tests/integration/tests/nice-resolver-names/Main.hs b/tests/integration/tests/nice-resolver-names/Main.hs index 47bfa94bba..8a6fd63158 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-21.16"] $ \snapshot -> do + for_ ["lts-20.26", "lts-21.22"] $ \snapshot -> do stack ["init", "--force", "--resolver", snapshot] str <- readFile "stack.yaml" case mapMaybe (stripPrefix "resolver: ") $ 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 278a3ea74d..7b6af6cf42 100644 --- a/tests/integration/tests/no-rerun-tests/files/stack.yaml +++ b/tests/integration/tests/no-rerun-tests/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 diff --git a/tests/integration/tests/override-compiler/Main.hs b/tests/integration/tests/override-compiler/Main.hs index d55e629ac8..ce06f0dd40 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.4.7") $ error $ "Invalid version: " ++ show ver + unless (concat (lines ver) == "9.4.8") $ 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 9be80fd08e..2187a2de6a 100644 --- a/tests/integration/tests/override-compiler/files/stack.yaml +++ b/tests/integration/tests/override-compiler/files/stack.yaml @@ -1,3 +1,3 @@ resolver: lts-20.26 -compiler: ghc-9.4.7 +compiler: ghc-9.4.8 packages: [] diff --git a/tests/integration/tests/proper-rebuilds/files/stack.yaml b/tests/integration/tests/proper-rebuilds/files/stack.yaml index 278a3ea74d..7b6af6cf42 100644 --- a/tests/integration/tests/proper-rebuilds/files/stack.yaml +++ b/tests/integration/tests/proper-rebuilds/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 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 7737b317d2..a2e448f344 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 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 eea611548d..a0a15782ab 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 --resolver ghc-9.4.7 script --extra-dep acme-missiles-0.3@rev:0 --extra-dep stm-2.5.2.1@rev:0 +-- stack --resolver ghc-9.4.8 script --extra-dep acme-missiles-0.3@rev:0 --extra-dep stm-2.5.2.1@rev:0 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 82993d5b3d..dc1715e44c 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 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 18cd9a5854..9368677e49 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 @@ -resolver: ghc-9.4.7 +resolver: ghc-9.4.8 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 3a39a8be50..b7a209b5d0 100644 --- a/tests/integration/tests/upload/files/stack.yaml +++ b/tests/integration/tests/upload/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-21.16 +resolver: lts-21.22 packages: - . diff --git a/tests/integration/tests/watched-files/files/stack.yaml b/tests/integration/tests/watched-files/files/stack.yaml index 29dbc9550f..f5fab4d8a4 100644 --- a/tests/integration/tests/watched-files/files/stack.yaml +++ b/tests/integration/tests/watched-files/files/stack.yaml @@ -1 +1 @@ -resolver: lts-21.16 +resolver: lts-21.22 From 0481e7b3c294611a42ef7e301306bf534bf45a5c Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Fri, 1 Dec 2023 21:53:49 +0000 Subject: [PATCH 2/2] Build Stan with GHC 9.4.8 --- .github/workflows/stan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stan.yml b/.github/workflows/stan.yml index b4ad6669fe..57d1a899b0 100644 --- a/.github/workflows/stan.yml +++ b/.github/workflows/stan.yml @@ -23,7 +23,7 @@ jobs: run: | git clone https://github.com/kowainik/stan.git cd stan - stack --local-bin-path ../.bin install + stack --compiler ghc-9.4.8 --local-bin-path ../.bin install cd .. - name: Generate .hie for analysis