diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index a6409a9b97..76cc97d7d3 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -16,12 +16,12 @@ on: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# As of 16 June 2023, ubuntu-latest, windows-latest and macos-latest come -# with Stack 2.11.1 and GHC 9.6.2. windows-latest comes with NSIS 3.08, for -# which the default value of the 'Unicode' installer attribute is 'true'. -# However, that is not the 'large strings' build of NSIS and creates installers -# that corrupt the PATH environment variable if the default string length of -# 1024 characters is exceeded. +# As of 8 August 2023, ubuntu-latest, windows-latest and macos-latest come +# with Stack 2.11.1 (2.9.3 on macos-latest) and GHC 9.6.2. windows-latest comes +# with NSIS 3.08, for which the default value of the 'Unicode' installer +# attribute is 'true'. However, that is not the 'large strings' build of NSIS +# and creates installers that corrupt the PATH environment variable if the +# default string length of 1024 characters is exceeded. jobs: integration-tests: @@ -81,7 +81,7 @@ jobs: nix-channel --add https://nixos.org/channels/nixos-23.05 nixpkgs # Download the Nix expressions for all subscribed channels... # - # As at 2023-06-05, nixos-23.05 provides GHC 9.2.7. + # As at 2023-08-11, nixos-23.05 provides GHC 9.2.8. nix-channel --update # The NIX_PATH environment variable sets a list of directories used to # look up the location of Nix expressions using paths enclosed in diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 427c80d97b..2b7e0218a2 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -9,8 +9,8 @@ on: - rc/** workflow_dispatch: -# As of 22 May 2023, ubuntu-latest, windows-latest and macos-latest come -# with Stack 2.9.3 and GHC 9.6.1. +# As of 9 August 2023, ubuntu-latest, windows-latest and macos-latest come +# with Stack 2.11.1 (2.9.3 on macos-latest) and GHC 9.6.2. jobs: pedantic: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b8514fb42b..4c53de852b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -286,7 +286,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 (May 2023) the package versions are primarily -ones in Stackage snapshot LTS Haskell 20.23 (for GHC 9.2.7), together with +ones in Stackage snapshot LTS Haskell 20.26 (for GHC 9.2.8), together with extra-dep `Cabal-3.8.1.0`. A Stack executable makes use of Cabal (the library) through a small 'Setup' diff --git a/cabal.config b/cabal.config index dafc7f5d8a..54653e2fd0 100644 --- a/cabal.config +++ b/cabal.config @@ -7,10 +7,10 @@ constraints: , StateVar ==1.2.2 , Win32 ==2.12.0.1 , aeson ==2.0.3.0 + , aeson-warning-parser ==0.1.0 , annotated-wl-pprint ==0.7.0 , ansi-terminal ==1.0 , ansi-terminal-types ==0.11.5 - , ansi-wl-pprint ==0.6.9 , appar ==0.1.8 , array ==0.5.4.0 , asn1-encoding ==0.9.6 @@ -43,7 +43,8 @@ constraints: , cmdargs ==0.10.22 , colour ==2.3.6 , comonad ==5.0.8 - , conduit ==1.3.4.3 + , companion ==0.1.0 + , conduit ==1.3.5 , conduit-combinators ==1.3.0 , conduit-extra ==1.3.6 , connection ==0.3.1 @@ -119,9 +120,9 @@ constraints: , old-locale ==1.0.0.7 , old-time ==1.1.0.3 , open-browser ==0.2.1.0 - , optparse-applicative ==0.17.0.0 + , optparse-applicative ==0.18.1.0 , optparse-simple ==0.1.1.4 - , pantry ==0.8.2.2 + , pantry ==0.9.1 , parsec ==3.1.15.0 , parser-combinators ==1.3.0 , path ==0.9.2 @@ -132,6 +133,8 @@ constraints: , persistent-sqlite ==2.13.1.1 , persistent-template ==2.12.0.0 , pretty ==1.1.3.6 + , prettyprinter ==1.7.1 + , prettyprinter-ansi-terminal ==1.1.3 , primitive ==0.7.3.0 , process ==1.6.16.0 , project-template ==0.2.1.0 @@ -148,17 +151,16 @@ constraints: , scientific ==0.3.7.0 , semialign ==1.2.0.1 , semigroupoids ==5.3.7 - , semigroups ==0.20 , silently ==1.2.5.3 , socks ==0.6.1 , split ==0.2.3.5 , splitmix ==0.1.0.4 , stack ==2.12.0 + , static-bytes ==0.1.0 , stm ==2.5.0.2 , stm-chans ==3.0.0.9 , streaming-commons ==0.2.2.6 , strict ==0.4.0.1 - , syb ==0.7.2.3 , tagged ==0.8.6.1 , tar ==0.5.1.1 , tar-conduit ==0.3.2 @@ -169,10 +171,8 @@ constraints: , text-short ==0.1.5 , th-abstraction ==0.4.5.0 , th-compat ==0.1.4 - , th-expand-syns ==0.4.11.0 , th-lift ==0.8.3 , th-lift-instances ==0.1.20 - , th-reify-many ==0.1.10 , these ==1.1.1.1 , time ==1.11.1.1 , time-compat ==1.9.6.1 @@ -181,8 +181,6 @@ constraints: , transformers-base ==0.4.6 , transformers-compat ==0.7.2 , typed-process ==0.2.11.0 - , unicode-data ==0.3.1 - , unicode-transforms ==0.4.0.1 , unix ==2.7.2.2 , unix-compat ==0.5.4 , unix-time ==0.4.9 diff --git a/cabal.project b/cabal.project index 1c4ef2189a..aa3f47fd6d 100644 --- a/cabal.project +++ b/cabal.project @@ -33,8 +33,8 @@ -- specified by the snapshot specifed in Stack's project-level YAML -- configuration file (`stack.yaml`). The relevant version of GHC can be -- confirmed by reviewing the snapshot on Stackage. For example, at: --- https://www.stackage.org/lts-20.23/cabal.config. +-- https://www.stackage.org/lts-20.26/cabal.config. -- -with-compiler: ghc-9.2.7 +with-compiler: ghc-9.2.8 import: cabal.config packages: . diff --git a/doc/GUIDE.md b/doc/GUIDE.md index bf8cf31b9b..89b9f835d8 100644 --- a/doc/GUIDE.md +++ b/doc/GUIDE.md @@ -248,15 +248,15 @@ this: ~~~yaml resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/19.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/26.yaml packages: - . ~~~ The value of the `resolver` key tells Stack *how* to build your package: which GHC version to use, versions of package dependencies, and so on. Our value here -says to use [LTS Haskell 20.23](https://www.stackage.org/lts-20.23), which -implies GHC 9.2.7 (which is why `stack build` installs that version of GHC if it +says to use [LTS Haskell 20.26](https://www.stackage.org/lts-20.26), which +implies GHC 9.2.8 (which is why `stack build` installs that version of GHC if it is not already available to Stack). There are a number of values you can use for `resolver`, which we'll cover later. @@ -503,7 +503,7 @@ also known as *snapshots*. We mentioned the LTS resolvers, and you can get quite a bit of information about it at [https://www.stackage.org/lts](https://www.stackage.org/lts), including: -* The appropriate resolver value (`resolver: lts-20.23`, as is currently the +* The appropriate resolver value (`resolver: lts-20.26`, 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-20.23`, let's change +Let's explore package sets a bit further. Instead of `lts-20.26`, let's change our `stack.yaml` file to use the [latest nightly](https://www.stackage.org/nightly). Right now, this is currently 2023-05-26 - please see the resolver from the link above to get the latest. @@ -1340,7 +1340,7 @@ yields output like: ~~~text Run from outside a project, using implicit global project config -Using latest snapshot resolver: lts-20.23 +Using latest snapshot resolver: lts-20.26 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 5db10712f7..68ee325a07 100644 --- a/doc/Stack_and_VS_Code.md +++ b/doc/Stack_and_VS_Code.md @@ -75,9 +75,9 @@ enabled). For further information about these options, see the `install-ghc` For this workaround to work, each time that a resolver is used that references a different version of GHC, then GHCup must be used to install it (if GHCup has -not already installed that version). For example, to use `resolver: lts-20.23` -(GHC 9.2.7), the command `ghcup install ghc 9.2.7` must have been used to -install GHC 9.2.7. That may be a minor inconvenience for some people, as one the +not already installed that version). For example, to use `resolver: lts-20.26` +(GHC 9.2.8), the command `ghcup install ghc 9.2.8` must have been used to +install GHC 9.2.8. That may be a minor inconvenience for some people, as one the 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 1543c1a448..1b3df06de3 100644 --- a/doc/custom_snapshot.md +++ b/doc/custom_snapshot.md @@ -17,8 +17,8 @@ available in snapshots to ensure reproducibility. snapshot specification. ~~~yaml -resolver: lts-20.23 # Inherits GHC version and package set -compiler: ghc-9.6.1 # Overwrites GHC version in the resolver, optional +resolver: lts-20.26 # Inherits GHC version and package set +compiler: ghc-9.6.2 # Overwrites GHC version in the resolver, optional # Additional packages, follows extra-deps syntax packages: @@ -61,35 +61,35 @@ custom snapshot, due to Stack sharing snapshot packages whenever possible. ### Overriding the compiler -The following snapshot specification will be identical to `lts-20.23`, but instead -use `ghc-9.2.6` instead of `ghc-9.2.7`: +The following snapshot specification will be identical to `lts-20.26`, but +instead use `ghc-9.2.7` instead of `ghc-9.2.8`: ~~~yaml -resolver: lts-20.23 -compiler: ghc-9.2.6 +resolver: lts-20.26 +compiler: ghc-9.2.7 ~~~ ### Dropping packages -The following snapshot specification will be identical to `lts-20.23`, 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. +The following snapshot specification will be identical to `lts-20.26`, but +without the `text` package in our snapshot. Removing this package will cause all +the packages that depend on `text` to be unbuildable, but they will still be +present in the snapshot. ~~~yaml -resolver: lts-20.23 +resolver: lts-20.26 drop-packages: - text ~~~ ### Hiding packages -The following snapshot specification will be identical to `lts-20.23`, but the +The following snapshot specification will be identical to `lts-20.26`, but the `text` package will be hidden when registering. This will affect, for example, the import parser in the script command. ~~~yaml -resolver: lts-20.23 +resolver: lts-20.26 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-20.23`, but +The following snapshot specification will be identical to `lts-20.26`, but provides `-O1` as a ghc-option for `text`: ~~~yaml -resolver: lts-20.23 +resolver: lts-20.26 packages: - text-1.2.5.0 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-20.23`, but +following snapshot specification will be identical to `lts-20.26`, but it enables the `developer` Cabal flag: ~~~yaml -resolver: lts-20.23 +resolver: lts-20.26 packages: - text-1.2.5.0 flags: diff --git a/doc/faq.md b/doc/faq.md index 7dcfc1622d..e603d6aa8b 100644 --- a/doc/faq.md +++ b/doc/faq.md @@ -9,7 +9,7 @@ here is to be as helpful and concise as possible. ## What version of GHC is used when I run something like `stack ghci`? The version of GHC, as well as which packages can be installed, are specified by -the _resolver_. This may be something like `lts-20.23`, which is from +the _resolver_. This may be something like `lts-20.26`, 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-20.23 +resolver: lts-20.26 packages: - . extra-deps: @@ -91,7 +91,7 @@ Add it to the directory where your `stack.yaml` file lives, e.g. ~~~yaml -resolver: lts-20.23 +resolver: lts-20.26 packages: - . extra-deps: diff --git a/doc/list_command.md b/doc/list_command.md index cdd3665ecf..b4109f4ab3 100644 --- a/doc/list_command.md +++ b/doc/list_command.md @@ -41,17 +41,17 @@ Package index cache populated Error: [S-4926] - Could not find package paltry on Hackage. Perhaps you meant: retry, path, pantry, pretty, pasty, xattr, alloy, para, pappy, alure -stack --resolver lts-20.23 list base unix Win32 acme-missiles pantry +stack --resolver lts-20.26 list base unix Win32 acme-missiles pantry Error: [S-4926] - Package does not appear in snapshot: base - Package does not appear in snapshot: unix - Package does not appear in snapshot: acme-missiles -stack --resolver lts-20.23 list Win32 pantry +stack --resolver lts-20.26 list Win32 pantry Win32-2.12.0.1 pantry-0.5.7 -stack --resolver lts-20.23 list +stack --resolver lts-20.26 list AC-Angle-1.0 ALUT-2.4.0.3 ... diff --git a/doc/script_command.md b/doc/script_command.md index c648ddae18..08cb5146a0 100644 --- a/doc/script_command.md +++ b/doc/script_command.md @@ -18,7 +18,7 @@ configuration files (global and project-level). A snapshot must be specified on the command line (with the `--resolver` option). For example: ~~~text -stack script --resolver lts-20.23 MyScript.hs +stack script --resolver lts-20.26 MyScript.hs ~~~ The `stack script` command behaves as if the `--install-ghc` flag had been @@ -100,7 +100,7 @@ main = do can be compiled and run, with arguments, with: ~~~text -stack --resolver lts-20.23 script --package acme-missiles --compile MyScript.hs -- "Don't panic!" "Duck and cover!" +stack --resolver lts-20.26 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 c50aa569a6..9cad44e90b 100644 --- a/doc/scripts.md +++ b/doc/scripts.md @@ -19,7 +19,7 @@ An example will be easiest to understand. Consider the Haskell source file ~~~haskell #!/usr/bin/env stack --- stack script --resolver lts-20.23 --package turtle +-- stack script --resolver lts-20.26 --package turtle {-# LANGUAGE OverloadedStrings #-} import Turtle (echo) main = echo "Hello World!" @@ -78,10 +78,10 @@ able to reuse everything already built). The second line of the source code is the Stack interpreter options comment. In this example, it specifies the `stack script` command with the options of a -LTS Haskell 20.23 snapshot (`--resolver lts-20.23`) and ensuring the +LTS Haskell 20.26 snapshot (`--resolver lts-20.26`) and ensuring the [`turtle` package](https://hackage.haskell.org/package/turtle) is available (`--package turtle`). The version of the package will be that in the specified -snapshot (`lts-20.23` provides `turtle-1.5.25`). +snapshot (`lts-20.26` provides `turtle-1.5.25`). ## Arguments and interpreter options and arguments @@ -116,7 +116,7 @@ For example, the command `stack MyScript.hs arg1 arg2` with `MyScript.hs`: ~~~haskell #!/usr/bin/env stack {- stack script - --resolver lts-20.23 + --resolver lts-20.26 -- +RTS -s -RTS -} @@ -132,7 +132,7 @@ main = do is equivalent to the following command at the command line: ~~~text -stack script --resolver lts-20.23 -- MyScript.hs arg1 arg2 +RTS -s -RTS +stack script --resolver lts-20.26 -- MyScript.hs arg1 arg2 +RTS -s -RTS ~~~ where `+RTS -s -RTS` are some of GHC's @@ -161,7 +161,7 @@ space separated list. For example: ~~~haskell #!/usr/bin/env stack {- stack script - --resolver lts-20.23 + --resolver lts-20.26 --package turtle --package "stm async" --package http-client,http-conduit @@ -191,7 +191,7 @@ which makes use of the joke package ~~~haskell {- stack script - --resolver lts-20.23 + --resolver lts-20.26 --package acme-missiles -} import Acme.Missiles (launchMissiles) @@ -202,7 +202,7 @@ main = launchMissiles The command `stack --script-no-run-compile Script.hs` then behaves as if the command -`stack script --resolver lts-20.23 --package acme-missiles --no-run --compile -- Script.hs` +`stack script --resolver lts-20.26 --package acme-missiles --no-run --compile -- Script.hs` had been given. `Script.hs` is compiled (without optimisation) and the resulting executable is not run: no missiles are launched in the process! @@ -239,7 +239,7 @@ example with `runghc`: {- stack runghc --install-ghc - --resolver lts-20.23 + --resolver lts-20.26 --package base --package turtle -- @@ -262,7 +262,7 @@ it. Here is an example: {- stack exec ghci --install-ghc - --resolver lts-20.23 + --resolver lts-20.26 --package turtle -} ~~~ diff --git a/doc/stack_yaml_vs_cabal_package_file.md b/doc/stack_yaml_vs_cabal_package_file.md index 3e943ba6fd..b0400f8982 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,051 packages at -specific version numbers. When you then specify `resolver: lts-20.23`, you're +, you will see a list of 3,055 packages at +specific version numbers. When you then specify `resolver: lts-20.26`, 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 c7b94c9902..f9040b2472 100644 --- a/doc/yaml_configuration.md +++ b/doc/yaml_configuration.md @@ -96,10 +96,10 @@ installation, and various settings like build flags. It is called a resolver since a snapshot states how dependencies are resolved. There are currently four resolver types: -* LTS Haskell snapshots, e.g. `resolver: lts-20.23` -* Stackage Nightly snapshots, e.g. `resolver: nightly-2023-05-05` +* LTS Haskell snapshots, e.g. `resolver: lts-20.26` +* Stackage Nightly snapshots, e.g. `resolver: nightly-2023-08-06` * No snapshot, just use packages shipped with the compiler. For GHC this looks - like `resolver: ghc-9.6.1` + like `resolver: ghc-9.6.2` * Custom snapshot, via a URL or relative file path. For further information, see the [Pantry](pantry.md) documentation. @@ -528,12 +528,12 @@ Command line equivalent (takes precedence): `--compiler` option Overrides the compiler version in the resolver. Note that the `compiler-check` flag also applies to the version numbers. This uses the same syntax as compiler -resolvers like `ghc-9.6.1`. This can be used to override the +resolvers like `ghc-9.6.2`. This can be used to override the compiler for a Stackage snapshot, like this: ~~~yaml -resolver: lts-20.23 -compiler: ghc-9.6.1 +resolver: lts-20.26 +compiler: ghc-9.6.2 compiler-check: match-exact ~~~ diff --git a/etc/dockerfiles/arm64.Dockerfile b/etc/dockerfiles/arm64.Dockerfile index 28ca455c86..2797576e81 100644 --- a/etc/dockerfiles/arm64.Dockerfile +++ b/etc/dockerfiles/arm64.Dockerfile @@ -1,10 +1,10 @@ -# Stack is built with GHC 9.2.7. GHC 9.2.7 for Linux/AArch64 says it was made on +# Stack is built with GHC 9.2.8. GHC 9.2.8 for Linux/AArch64 says it was made on # a Debian 10 system and requires GMP 6.1. Debian 10 is codename 'buster' and # includes libc6 (2.28-10+deb10u1). FROM debian:buster # pkg-config added to `apt-get install` list because it is required by package -# digest-0.0.1.4. +# digest-0.0.1.7. RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y \ curl build-essential curl libffi-dev libffi6 libgmp-dev libgmp10 \ libncurses-dev libncurses5 libtinfo5 libnuma-dev xz-utils g++ gcc \ @@ -22,7 +22,7 @@ RUN cd /tmp && \ # Stack's *.tar archive contains a directory that contains the 'stack' # executable, hence the use of tar's '--strip-components 1' option. -RUN curl -L https://github.com/commercialhaskell/stack/releases/download/v2.9.3/stack-2.9.3-linux-aarch64.tar.gz --output /tmp/stack.tar.gz && \ +RUN curl -L https://github.com/commercialhaskell/stack/releases/download/v2.11.1/stack-2.11.1-linux-aarch64.tar.gz --output /tmp/stack.tar.gz && \ tar xfv /tmp/stack.tar.gz -C /usr/local/bin --strip-components 1 && \ rm /tmp/stack.tar.gz @@ -54,5 +54,5 @@ RUN stack build shake COPY etc/scripts/release.hs /src -RUN stack script --resolver lts-20.23 --extra-dep Cabal-3.6.3.0 --compile /src/release.hs -- --version +RUN stack script --resolver lts-20.26 --compile /src/release.hs -- --version RUN cp /src/release /home/stack diff --git a/etc/scripts/build-stack-installer.hs b/etc/scripts/build-stack-installer.hs index cf0716e709..57b02ae84d 100644 --- a/etc/scripts/build-stack-installer.hs +++ b/etc/scripts/build-stack-installer.hs @@ -1,5 +1,5 @@ {- stack script - --resolver lts-20.23 + --resolver lts-20.26 --install-ghc --package nsis -} diff --git a/etc/scripts/release.hs b/etc/scripts/release.hs index 2339df7045..30e25eb049 100644 --- a/etc/scripts/release.hs +++ b/etc/scripts/release.hs @@ -1,5 +1,5 @@ {- stack script - --resolver lts-20.23 + --resolver lts-20.26 --extra-dep Cabal-3.6.3.0 --extra-dep directory-1.3.6.2 --ghc-options -Wall @@ -9,7 +9,7 @@ -- interpreter options comment, Stack deduces the required packages from the -- module imports, being: Cabal, base, bytestring, directory, extra, process, -- shake, tar, zip-archive and zlib. These are either GHC boot packages or in --- the snapshot. However, Stackage LTS 20.23 includes `Win32` directly, which +-- the snapshot. However, Stackage LTS 20.26 includes `Win32` directly, which -- results in `Cabal` and `directory` being 'replaced' on Windows. Consequently, -- they need to be specified as extra deps. diff --git a/src/Stack/Constants.hs b/src/Stack/Constants.hs index e19401832b..c561a8f5d2 100644 --- a/src/Stack/Constants.hs +++ b/src/Stack/Constants.hs @@ -242,7 +242,7 @@ wiredInPackages = case mparsed of [ "ghc-prim" -- A magic package , "integer-gmp" - -- No longer magic > 1.0.3.0. With GHC 9.2.7 at least, there seems to be + -- No longer magic > 1.0.3.0. With GHC 9.2.8 at least, there seems to be -- no problem in using it. , "integer-simple" -- A magic package @@ -254,16 +254,16 @@ wiredInPackages = case mparsed of -- A magic package , "dph-seq" -- Deprecated in favour of dph-prim-seq, which does not appear to be - -- magic. With GHC 9.2.7 at least, there seems to be no problem in using + -- magic. With GHC 9.2.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.2.7 at least, there seems to be no problem in using + -- magic. With GHC 9.2.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.2.7 + -- Could not identify information about this package name. With GHC 9.2.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 aa1466603e..f79693c0c5 100644 --- a/src/Stack/Init.hs +++ b/src/Stack/Init.hs @@ -421,8 +421,8 @@ renderStackYaml p ignoredPackages dupPackages = , "A snapshot resolver dictates the compiler version and the set of packages" , "to be used for project dependencies. For example:" , "" - , "resolver: lts-20.23" - , "resolver: nightly-2023-05-26" + , "resolver: lts-20.26" + , "resolver: nightly-2023-08-06" , "resolver: ghc-9.6.2" , "" , "The location of a snapshot can be provided as a file or url. Stack assumes" diff --git a/src/Stack/Options/SetupParser.hs b/src/Stack/Options/SetupParser.hs index afd249d11e..705262588c 100644 --- a/src/Stack/Options/SetupParser.hs +++ b/src/Stack/Options/SetupParser.hs @@ -19,7 +19,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.2.7. (default: install \ + <> OA.help "Version of GHC to install, e.g. 9.6.2. (default: install \ \the version implied by the resolver)" )) <*> OA.boolFlags False diff --git a/stack.yaml b/stack.yaml index 9e12fb926d..3727e8a55e 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,10 +1,10 @@ -# GHC 9.2.7 -resolver: lts-20.23 +# GHC 9.2.8 +resolver: lts-20.26 extra-deps: -# lts-20.23 specifies Cabal-3.6.3.0 +# lts-20.26 specifies Cabal-3.6.3.0 - Cabal-3.8.1.0@sha256:155d64beeecbae2b19e5d67844532494af88bc8795d4db4146a0c29296f59967,12220 -# lts-20.23 specifies Cabal-syntax-3.6.0.0 +# lts-20.26 specifies Cabal-syntax-3.6.0.0 - Cabal-syntax-3.8.1.0@sha256:4936765e9a7a8ecbf8fdbe9067f6d972bc0299220063abb2632a9950af64b966,7619 - aeson-warning-parser-0.1.0@sha256:f2c1c42b73aa35d352060abcbb867c410cbbf57d0cb0fed607bcd1e2a74954ad,1308 - ansi-terminal-1.0@sha256:640ffecfd95471388d939fcacb57bdc0cef15f0457746c234a12cdd5a6c6d1e8,2706 @@ -38,7 +38,7 @@ drop-packages: docker: enable: false - repo: fpco/alpine-haskell-stack:9.2.7 + repo: glcr.b-data.ch/ghc/ghc-musl:9.2.8 nix: # --nix on the command-line to enable. diff --git a/stack.yaml.lock b/stack.yaml.lock index 7228c0c15c..aade5de396 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -188,7 +188,7 @@ packages: hackage: tls-1.7.0@sha256:fa82e9ca8fd887b66fba8433b3ba1db4e5e047fe7c815707f06209679d04177b,5566 snapshots: - completed: - sha256: 4c972e067bae16b95961dbfdd12e07f1ee6c8fffabbfa05c3d65100b03f548b7 - size: 650253 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/23.yaml - original: lts-20.23 + sha256: 5a59b2a405b3aba3c00188453be172b85893cab8ebc352b1ef58b0eae5d248a2 + size: 650475 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/26.yaml + original: lts-20.26 diff --git a/test/integration/lib/StackTest.hs b/test/integration/lib/StackTest.hs index 6a3710e444..20218b5d39 100644 --- a/test/integration/lib/StackTest.hs +++ b/test/integration/lib/StackTest.hs @@ -363,7 +363,7 @@ isMacOSX = os == "darwin" -- the main @stack.yaml@. -- defaultResolverArg :: String -defaultResolverArg = "--resolver=lts-20.23" +defaultResolverArg = "--resolver=lts-20.26" -- | Remove a file and ignore any warnings about missing files. removeFileIgnore :: HasCallStack => FilePath -> IO () diff --git a/test/integration/tests/111-custom-snapshot/files/my-snapshot.yaml b/test/integration/tests/111-custom-snapshot/files/my-snapshot.yaml index 9f1fe07fd4..39e7ba947d 100644 --- a/test/integration/tests/111-custom-snapshot/files/my-snapshot.yaml +++ b/test/integration/tests/111-custom-snapshot/files/my-snapshot.yaml @@ -1,4 +1,4 @@ -compiler: ghc-9.2.7 +compiler: ghc-9.2.8 name: my-snapshot packages: - mtl-2.2.1 diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml b/test/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml index c447b13039..8b4b298e4a 100644 --- a/test/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml +++ b/test/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 name: test-snapshot-2 packages: - stm-2.5.0.0 diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml b/test/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml index 8640fc61d0..6d2fd618be 100644 --- a/test/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml +++ b/test/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.23 +resolver: lts-20.26 name: snapshot-modify-lts drop-packages: - zlib diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml b/test/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml index 246214ec6e..50a9b4a1a7 100644 --- a/test/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml +++ b/test/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml @@ -1,5 +1,5 @@ --- -resolver: lts-20.23 +resolver: lts-20.26 name: local-snapshot packages: - archive: package-0.1.2.3.tar.gz diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml b/test/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml index feedf81f66..da5998af47 100644 --- a/test/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml +++ b/test/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml @@ -1,5 +1,5 @@ --- -resolver: lts-20.23 +resolver: lts-20.26 name: remote-snapshot packages: - archive: https://s3.amazonaws.com/hackage.fpcomplete.com/package/ghc-prim-0.8.0.tar.gz diff --git a/test/integration/tests/1337-unicode-everywhere/files/stack.yaml b/test/integration/tests/1337-unicode-everywhere/files/stack.yaml index 0bae4295be..5831cb05ee 100644 --- a/test/integration/tests/1337-unicode-everywhere/files/stack.yaml +++ b/test/integration/tests/1337-unicode-everywhere/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.23 +resolver: lts-20.26 packages: - '.' extra-deps: [] diff --git a/test/integration/tests/1438-configure-options/files/stack-everything.yaml b/test/integration/tests/1438-configure-options/files/stack-everything.yaml index 3cc9026506..4dc4bb9668 100644 --- a/test/integration/tests/1438-configure-options/files/stack-everything.yaml +++ b/test/integration/tests/1438-configure-options/files/stack-everything.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 extra-deps: - acme-dont-1.1@rev:0 diff --git a/test/integration/tests/1438-configure-options/files/stack-locals.yaml b/test/integration/tests/1438-configure-options/files/stack-locals.yaml index 0f35e632f0..14ba44261f 100644 --- a/test/integration/tests/1438-configure-options/files/stack-locals.yaml +++ b/test/integration/tests/1438-configure-options/files/stack-locals.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 extra-deps: - acme-dont-1.1@rev:0 diff --git a/test/integration/tests/1438-configure-options/files/stack-name.yaml b/test/integration/tests/1438-configure-options/files/stack-name.yaml index 12b5664ced..ed28ab680a 100644 --- a/test/integration/tests/1438-configure-options/files/stack-name.yaml +++ b/test/integration/tests/1438-configure-options/files/stack-name.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 extra-deps: - acme-dont-1.1@rev:0 diff --git a/test/integration/tests/1438-configure-options/files/stack-targets.yaml b/test/integration/tests/1438-configure-options/files/stack-targets.yaml index f9d900283d..4cf7d2bf2a 100644 --- a/test/integration/tests/1438-configure-options/files/stack-targets.yaml +++ b/test/integration/tests/1438-configure-options/files/stack-targets.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 extra-deps: - acme-dont-1.1@rev:0 diff --git a/test/integration/tests/1659-skip-component/files/stack.yaml b/test/integration/tests/1659-skip-component/files/stack.yaml index 0bae4295be..5831cb05ee 100644 --- a/test/integration/tests/1659-skip-component/files/stack.yaml +++ b/test/integration/tests/1659-skip-component/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.23 +resolver: lts-20.26 packages: - '.' extra-deps: [] diff --git a/test/integration/tests/1884-url-to-tarball/files/stack.yaml b/test/integration/tests/1884-url-to-tarball/files/stack.yaml index 940f3793de..765fbc1a42 100644 --- a/test/integration/tests/1884-url-to-tarball/files/stack.yaml +++ b/test/integration/tests/1884-url-to-tarball/files/stack.yaml @@ -2,4 +2,4 @@ extra-deps: - location: https://hackage.haskell.org/package/half-0.2.2.3/half-0.2.2.3.tar.gz sha256: 85c244c80d1c889a3d79073a6f5a99d9e769dbe3c574ca11d992b2b4f7599a5c size: 6050 -resolver: lts-20.23 +resolver: lts-20.26 diff --git a/test/integration/tests/2195-depend-on-exe/files/stack.yaml b/test/integration/tests/2195-depend-on-exe/files/stack.yaml index c2f80207e5..fc9172fa2f 100644 --- a/test/integration/tests/2195-depend-on-exe/files/stack.yaml +++ b/test/integration/tests/2195-depend-on-exe/files/stack.yaml @@ -1 +1 @@ -resolver: lts-20.23 +resolver: lts-20.26 diff --git a/test/integration/tests/2433-ghc-by-version/files/run.sh b/test/integration/tests/2433-ghc-by-version/files/run.sh index f3e6c84e8e..368dc50073 100755 --- a/test/integration/tests/2433-ghc-by-version/files/run.sh +++ b/test/integration/tests/2433-ghc-by-version/files/run.sh @@ -2,10 +2,10 @@ set -exuo pipefail -export PATH=$(pwd)/fake-path:$("$STACK_EXE" path --resolver ghc-9.2.7 --compiler-bin):$PATH +export PATH=$(pwd)/fake-path:$("$STACK_EXE" path --resolver ghc-9.2.8 --compiler-bin):$PATH export STACK_ROOT=$(pwd)/fake-root which ghc -"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.2.7 ghc -- --info -"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.2.7 runghc foo.hs +"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.2.8 ghc -- --info +"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.2.8 runghc foo.hs diff --git a/test/integration/tests/2643-copy-compiler-tool/Main.hs b/test/integration/tests/2643-copy-compiler-tool/Main.hs index 085311d230..f98458cbce 100644 --- a/test/integration/tests/2643-copy-compiler-tool/Main.hs +++ b/test/integration/tests/2643-copy-compiler-tool/Main.hs @@ -18,7 +18,8 @@ main = do stack ["exec", "--", "baz-exe" ++ exeExt] stackErr ["exec", "--", "bar-exe" ++ exeExt] stackCleanFull - -- See #4936 for details regarding the windows condition + -- See #4936. The Windows condition is because `stackCleanFull` may have + -- failed. unless isWindows $ stackErr ["exec", "--", "baz-exe" ++ exeExt] -- install one exe normally @@ -50,7 +51,9 @@ main = do -- foo was installed as a normal exe (in .binny/, which can't be on PATH), -- so shouldn't - stackErr ["exec", "--", "foo-exe" ++ exeExt] + -- See #4936. The Windows condition is because `stackCleanFull` may have + -- failed. + unless isWindows $ stackErr ["exec", "--", "foo-exe" ++ exeExt] -- check existences make sense doesExist $ "./binny/foo-exe" ++ exeExt diff --git a/test/integration/tests/2781-shadow-bug/files/stack.yaml b/test/integration/tests/2781-shadow-bug/files/stack.yaml index 07d1b02537..8373d1e946 100644 --- a/test/integration/tests/2781-shadow-bug/files/stack.yaml +++ b/test/integration/tests/2781-shadow-bug/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 packages: - foo - bar diff --git a/test/integration/tests/2997-ensure-warnings-output/files/stack.yaml b/test/integration/tests/2997-ensure-warnings-output/files/stack.yaml index ee0b227108..f724a1652d 100644 --- a/test/integration/tests/2997-ensure-warnings-output/files/stack.yaml +++ b/test/integration/tests/2997-ensure-warnings-output/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 packages: - foo - bar diff --git a/test/integration/tests/32-unlisted-module/files/stack.yaml b/test/integration/tests/32-unlisted-module/files/stack.yaml index 5a445ec68c..42d4ec589c 100644 --- a/test/integration/tests/32-unlisted-module/files/stack.yaml +++ b/test/integration/tests/32-unlisted-module/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-20.23 +resolver: lts-20.26 diff --git a/test/integration/tests/3315-multi-ghc-options/files/stack.yaml b/test/integration/tests/3315-multi-ghc-options/files/stack.yaml index 53df159924..7100eeeb15 100644 --- a/test/integration/tests/3315-multi-ghc-options/files/stack.yaml +++ b/test/integration/tests/3315-multi-ghc-options/files/stack.yaml @@ -1,3 +1,3 @@ -resolver: lts-20.23 +resolver: lts-20.26 packages: - '.' diff --git a/test/integration/tests/335-multi-package-flags/files/stack.yaml b/test/integration/tests/335-multi-package-flags/files/stack.yaml index 5a445ec68c..42d4ec589c 100644 --- a/test/integration/tests/335-multi-package-flags/files/stack.yaml +++ b/test/integration/tests/335-multi-package-flags/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-20.23 +resolver: lts-20.26 diff --git a/test/integration/tests/3390-unbuildable-test/files/stack.yaml b/test/integration/tests/3390-unbuildable-test/files/stack.yaml index b461ea7a64..4324da7693 100644 --- a/test/integration/tests/3390-unbuildable-test/files/stack.yaml +++ b/test/integration/tests/3390-unbuildable-test/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 diff --git a/test/integration/tests/3396-package-indices/files/my-snapshot.yaml b/test/integration/tests/3396-package-indices/files/my-snapshot.yaml index b73322e1e5..a7feaca2cc 100644 --- a/test/integration/tests/3396-package-indices/files/my-snapshot.yaml +++ b/test/integration/tests/3396-package-indices/files/my-snapshot.yaml @@ -1,4 +1,4 @@ -compiler: ghc-9.2.7 +compiler: ghc-9.2.8 name: my-snapshot packages: diff --git a/test/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml b/test/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml index 0156b2303e..8b0f692a3c 100644 --- a/test/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml +++ b/test/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 name: custom1 packages: - stm-2.5.0.0 diff --git a/test/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml b/test/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml index 9dc2f111d6..94760648a8 100644 --- a/test/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml +++ b/test/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 name: custom2 packages: - stm-2.5.0.0 diff --git a/test/integration/tests/345-override-bytestring/files/stack.yaml b/test/integration/tests/345-override-bytestring/files/stack.yaml index 298737d601..75a0e1016d 100644 --- a/test/integration/tests/345-override-bytestring/files/stack.yaml +++ b/test/integration/tests/345-override-bytestring/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.23 +resolver: lts-20.26 extra-deps: - bytestring-0.11.3.1 - binary-0.8.9.0 diff --git a/test/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml b/test/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml index 0fe12def7b..4c40fd27c7 100644 --- a/test/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml +++ b/test/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.23 +resolver: lts-20.26 packages: - ./local-mmorph diff --git a/test/integration/tests/3574-extra-dep-local/files/stack.yaml b/test/integration/tests/3574-extra-dep-local/files/stack.yaml index 36e1d5b627..c14bfffe94 100644 --- a/test/integration/tests/3574-extra-dep-local/files/stack.yaml +++ b/test/integration/tests/3574-extra-dep-local/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 packages: [] diff --git a/test/integration/tests/3591-cabal-warnings-once/files/stack.yaml b/test/integration/tests/3591-cabal-warnings-once/files/stack.yaml index c2f80207e5..fc9172fa2f 100644 --- a/test/integration/tests/3591-cabal-warnings-once/files/stack.yaml +++ b/test/integration/tests/3591-cabal-warnings-once/files/stack.yaml @@ -1 +1 @@ -resolver: lts-20.23 +resolver: lts-20.26 diff --git a/test/integration/tests/365-invalid-success/files/stack.yaml b/test/integration/tests/365-invalid-success/files/stack.yaml index 5a445ec68c..42d4ec589c 100644 --- a/test/integration/tests/365-invalid-success/files/stack.yaml +++ b/test/integration/tests/365-invalid-success/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-20.23 +resolver: lts-20.26 diff --git a/test/integration/tests/366-non-root-dir/files/stack.yaml b/test/integration/tests/366-non-root-dir/files/stack.yaml index 5a445ec68c..42d4ec589c 100644 --- a/test/integration/tests/366-non-root-dir/files/stack.yaml +++ b/test/integration/tests/366-non-root-dir/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-20.23 +resolver: lts-20.26 diff --git a/test/integration/tests/370-invalid-setup-hs/files/stack.yaml b/test/integration/tests/370-invalid-setup-hs/files/stack.yaml index b461ea7a64..4324da7693 100644 --- a/test/integration/tests/370-invalid-setup-hs/files/stack.yaml +++ b/test/integration/tests/370-invalid-setup-hs/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 diff --git a/test/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml b/test/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml index c2f80207e5..fc9172fa2f 100644 --- a/test/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml +++ b/test/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml @@ -1 +1 @@ -resolver: lts-20.23 +resolver: lts-20.26 diff --git a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml b/test/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml index d5c8208d5e..5bb8bb5528 100644 --- a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml +++ b/test/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 packages: - ./bad-bounds.tar diff --git a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml b/test/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml index 515df2d170..e1d9f3c613 100644 --- a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml +++ b/test/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 extra-deps: - ./bad-bounds.tar diff --git a/test/integration/tests/3863-purge-command/files/stack.yaml b/test/integration/tests/3863-purge-command/files/stack.yaml index 5a445ec68c..42d4ec589c 100644 --- a/test/integration/tests/3863-purge-command/files/stack.yaml +++ b/test/integration/tests/3863-purge-command/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-20.23 +resolver: lts-20.26 diff --git a/test/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml b/test/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml index 4fa137e0a2..872947457a 100644 --- a/test/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml +++ b/test/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 extra-deps: - stm-2.4.4.1 - mtl-2.2.1 diff --git a/test/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml b/test/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml index 4fa137e0a2..872947457a 100644 --- a/test/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml +++ b/test/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 extra-deps: - stm-2.4.4.1 - mtl-2.2.1 diff --git a/test/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml b/test/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml index 99a55a02fb..f1f47b5985 100644 --- a/test/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml +++ b/test/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml @@ -1,3 +1,3 @@ -resolver: lts-20.23 +resolver: lts-20.26 extra-deps: - base-4.10.1.0 diff --git a/test/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml b/test/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml index c2f80207e5..fc9172fa2f 100644 --- a/test/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml +++ b/test/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml @@ -1 +1 @@ -resolver: lts-20.23 +resolver: lts-20.26 diff --git a/test/integration/tests/3942-solver-error-output/files/test-stack.yml b/test/integration/tests/3942-solver-error-output/files/test-stack.yml index 879ba6c26a..748bc93db2 100644 --- a/test/integration/tests/3942-solver-error-output/files/test-stack.yml +++ b/test/integration/tests/3942-solver-error-output/files/test-stack.yml @@ -1,4 +1,4 @@ -resolver: lts-20.23 +resolver: lts-20.26 packages: [] diff --git a/test/integration/tests/3959-order-of-flags/files/stack.yaml b/test/integration/tests/3959-order-of-flags/files/stack.yaml index c2f80207e5..fc9172fa2f 100644 --- a/test/integration/tests/3959-order-of-flags/files/stack.yaml +++ b/test/integration/tests/3959-order-of-flags/files/stack.yaml @@ -1 +1 @@ -resolver: lts-20.23 +resolver: lts-20.26 diff --git a/test/integration/tests/397-case-insensitive-flags/files/stack.yaml b/test/integration/tests/397-case-insensitive-flags/files/stack.yaml index c2f80207e5..fc9172fa2f 100644 --- a/test/integration/tests/397-case-insensitive-flags/files/stack.yaml +++ b/test/integration/tests/397-case-insensitive-flags/files/stack.yaml @@ -1 +1 @@ -resolver: lts-20.23 +resolver: lts-20.26 diff --git a/test/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml b/test/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml index 4fa137e0a2..872947457a 100644 --- a/test/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml +++ b/test/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 extra-deps: - stm-2.4.4.1 - mtl-2.2.1 diff --git a/test/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml b/test/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml index c2f80207e5..fc9172fa2f 100644 --- a/test/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml +++ b/test/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml @@ -1 +1 @@ -resolver: lts-20.23 +resolver: lts-20.26 diff --git a/test/integration/tests/4001-excess-recompilation/files/stack.yaml b/test/integration/tests/4001-excess-recompilation/files/stack.yaml index b461ea7a64..4324da7693 100644 --- a/test/integration/tests/4001-excess-recompilation/files/stack.yaml +++ b/test/integration/tests/4001-excess-recompilation/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 diff --git a/test/integration/tests/4044-no-run-tests-config/files/stack.yaml b/test/integration/tests/4044-no-run-tests-config/files/stack.yaml index cbf0f36f84..d6284748a7 100644 --- a/test/integration/tests/4044-no-run-tests-config/files/stack.yaml +++ b/test/integration/tests/4044-no-run-tests-config/files/stack.yaml @@ -1,4 +1,4 @@ build: test-arguments: no-run-tests: true -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 diff --git a/test/integration/tests/4095-utf8-pure-nix/files/stack.yaml b/test/integration/tests/4095-utf8-pure-nix/files/stack.yaml index c2f80207e5..fc9172fa2f 100644 --- a/test/integration/tests/4095-utf8-pure-nix/files/stack.yaml +++ b/test/integration/tests/4095-utf8-pure-nix/files/stack.yaml @@ -1 +1 @@ -resolver: lts-20.23 +resolver: lts-20.26 diff --git a/test/integration/tests/4101-dependency-tree/files/stack.yaml b/test/integration/tests/4101-dependency-tree/files/stack.yaml index 2c907bece4..9aaa8b1e50 100644 --- a/test/integration/tests/4101-dependency-tree/files/stack.yaml +++ b/test/integration/tests/4101-dependency-tree/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.23 +resolver: lts-20.26 packages: - . - subproject diff --git a/test/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml b/test/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml index c2f80207e5..fc9172fa2f 100644 --- a/test/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml +++ b/test/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml @@ -1 +1 @@ -resolver: lts-20.23 +resolver: lts-20.26 diff --git a/test/integration/tests/4215-missing-unregister/files/stack1.yaml b/test/integration/tests/4215-missing-unregister/files/stack1.yaml index a3a172514a..83fadb8d3c 100644 --- a/test/integration/tests/4215-missing-unregister/files/stack1.yaml +++ b/test/integration/tests/4215-missing-unregister/files/stack1.yaml @@ -1,3 +1,3 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 packages: - v1 diff --git a/test/integration/tests/4215-missing-unregister/files/stack2.yaml b/test/integration/tests/4215-missing-unregister/files/stack2.yaml index e0387b3efa..e741fce22b 100644 --- a/test/integration/tests/4215-missing-unregister/files/stack2.yaml +++ b/test/integration/tests/4215-missing-unregister/files/stack2.yaml @@ -1,3 +1,3 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 packages: - v2 diff --git a/test/integration/tests/4270-files-order/files/stack.yaml b/test/integration/tests/4270-files-order/files/stack.yaml index 3f1e858ed6..52479c960e 100644 --- a/test/integration/tests/4270-files-order/files/stack.yaml +++ b/test/integration/tests/4270-files-order/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.23 +resolver: lts-20.26 packages: - . diff --git a/test/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml b/test/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml index b461ea7a64..4324da7693 100644 --- a/test/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml +++ b/test/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 diff --git a/test/integration/tests/4390-dot-no-ghc/files/stack.yaml b/test/integration/tests/4390-dot-no-ghc/files/stack.yaml index b461ea7a64..4324da7693 100644 --- a/test/integration/tests/4390-dot-no-ghc/files/stack.yaml +++ b/test/integration/tests/4390-dot-no-ghc/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 diff --git a/test/integration/tests/4453-detailed/files/stack.yaml b/test/integration/tests/4453-detailed/files/stack.yaml index 53df159924..7100eeeb15 100644 --- a/test/integration/tests/4453-detailed/files/stack.yaml +++ b/test/integration/tests/4453-detailed/files/stack.yaml @@ -1,3 +1,3 @@ -resolver: lts-20.23 +resolver: lts-20.26 packages: - '.' diff --git a/test/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml b/test/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml index b461ea7a64..4324da7693 100644 --- a/test/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml +++ b/test/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml @@ -1 +1 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 diff --git a/test/integration/tests/4488-newer-cabal-version/files/stack-good.yaml b/test/integration/tests/4488-newer-cabal-version/files/stack-good.yaml index e21cc3e9b4..ddc521c7aa 100644 --- a/test/integration/tests/4488-newer-cabal-version/files/stack-good.yaml +++ b/test/integration/tests/4488-newer-cabal-version/files/stack-good.yaml @@ -1,3 +1,3 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 extra-deps: - Cabal-2.4.1.0 diff --git a/test/integration/tests/4754-rebuild-haddocks/files/stack.yaml b/test/integration/tests/4754-rebuild-haddocks/files/stack.yaml index b461ea7a64..4324da7693 100644 --- a/test/integration/tests/4754-rebuild-haddocks/files/stack.yaml +++ b/test/integration/tests/4754-rebuild-haddocks/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 diff --git a/test/integration/tests/4783-doctest-deps/files/snapshot.yaml b/test/integration/tests/4783-doctest-deps/files/snapshot.yaml index abf4406df6..021f71e4b7 100644 --- a/test/integration/tests/4783-doctest-deps/files/snapshot.yaml +++ b/test/integration/tests/4783-doctest-deps/files/snapshot.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.23 +resolver: lts-20.26 name: foo packages: - acme-dont-1.1@sha256:8264ad3e5113d3e0417b46e71d5a9c0914a1f03b5b81319cc329f1dc0f49b96c,602 diff --git a/test/integration/tests/4897-boot-package-pruned/files/stack.yaml b/test/integration/tests/4897-boot-package-pruned/files/stack.yaml index 43af04abbc..89ce69d9f5 100644 --- a/test/integration/tests/4897-boot-package-pruned/files/stack.yaml +++ b/test/integration/tests/4897-boot-package-pruned/files/stack.yaml @@ -1,3 +1,3 @@ -resolver: lts-20.23 +resolver: lts-20.26 packages: [.] extra-deps: [./directory] diff --git a/test/integration/tests/4938-non-ascii-module-names/files/stack.yaml b/test/integration/tests/4938-non-ascii-module-names/files/stack.yaml index c2f80207e5..fc9172fa2f 100644 --- a/test/integration/tests/4938-non-ascii-module-names/files/stack.yaml +++ b/test/integration/tests/4938-non-ascii-module-names/files/stack.yaml @@ -1 +1 @@ -resolver: lts-20.23 +resolver: lts-20.26 diff --git a/test/integration/tests/5180-ghc-rts-flags/files/stack.yaml b/test/integration/tests/5180-ghc-rts-flags/files/stack.yaml index b441547b9e..0c8db92a14 100644 --- a/test/integration/tests/5180-ghc-rts-flags/files/stack.yaml +++ b/test/integration/tests/5180-ghc-rts-flags/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.23 +resolver: lts-20.26 packages: - . diff --git a/test/integration/tests/5272-only-locals/files/stack.yaml b/test/integration/tests/5272-only-locals/files/stack.yaml index b6b6a8c282..cf530135fb 100644 --- a/test/integration/tests/5272-only-locals/files/stack.yaml +++ b/test/integration/tests/5272-only-locals/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 extra-deps: - unliftio-core-0.2.0.1@sha256:f9abcdd3f3d28e4840563efb7b8760d2de9b5707bcd6f53a87f6a0d77bb5a9f7,1082 # Force a unique snapshot diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml b/test/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml index e755e328e9..c644f40376 100644 --- a/test/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml +++ b/test/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.23 +resolver: lts-20.26 packages: - . - ../package-c diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml b/test/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml index e755e328e9..c644f40376 100644 --- a/test/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml +++ b/test/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.23 +resolver: lts-20.26 packages: - . - ../package-c diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml b/test/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml index 5374ba0bdc..1f407f6f5a 100644 --- a/test/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml +++ b/test/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml @@ -1,3 +1,3 @@ -resolver: lts-20.23 +resolver: lts-20.26 packages: - . diff --git a/test/integration/tests/6046-missing-sublib-unregister/files/stack.yaml b/test/integration/tests/6046-missing-sublib-unregister/files/stack.yaml index c2f80207e5..fc9172fa2f 100644 --- a/test/integration/tests/6046-missing-sublib-unregister/files/stack.yaml +++ b/test/integration/tests/6046-missing-sublib-unregister/files/stack.yaml @@ -1 +1 @@ -resolver: lts-20.23 +resolver: lts-20.26 diff --git a/test/integration/tests/606-local-version-not-exist/files/stack.yaml b/test/integration/tests/606-local-version-not-exist/files/stack.yaml index 5a445ec68c..42d4ec589c 100644 --- a/test/integration/tests/606-local-version-not-exist/files/stack.yaml +++ b/test/integration/tests/606-local-version-not-exist/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-20.23 +resolver: lts-20.26 diff --git a/test/integration/tests/617-extra-dep-flag/files/stack.yaml b/test/integration/tests/617-extra-dep-flag/files/stack.yaml index 85cad54d36..8eae22b03b 100644 --- a/test/integration/tests/617-extra-dep-flag/files/stack.yaml +++ b/test/integration/tests/617-extra-dep-flag/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 flags: text: integer-simple: false diff --git a/test/integration/tests/617-unused-flag-cli/files/stack.yaml b/test/integration/tests/617-unused-flag-cli/files/stack.yaml index b461ea7a64..4324da7693 100644 --- a/test/integration/tests/617-unused-flag-cli/files/stack.yaml +++ b/test/integration/tests/617-unused-flag-cli/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 diff --git a/test/integration/tests/617-unused-flag-name-yaml/files/stack.yaml b/test/integration/tests/617-unused-flag-name-yaml/files/stack.yaml index 7dd001bc15..065da38360 100644 --- a/test/integration/tests/617-unused-flag-name-yaml/files/stack.yaml +++ b/test/integration/tests/617-unused-flag-name-yaml/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 flags: files: does-not-exist: false diff --git a/test/integration/tests/617-unused-flag-yaml/files/stack.yaml b/test/integration/tests/617-unused-flag-yaml/files/stack.yaml index ff46ebe14b..69b32e166b 100644 --- a/test/integration/tests/617-unused-flag-yaml/files/stack.yaml +++ b/test/integration/tests/617-unused-flag-yaml/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 flags: does-not-exist: foo: false diff --git a/test/integration/tests/620-env-command/files/run.sh b/test/integration/tests/620-env-command/files/run.sh index 0ad83c8bae..f89ad2e294 100644 --- a/test/integration/tests/620-env-command/files/run.sh +++ b/test/integration/tests/620-env-command/files/run.sh @@ -2,6 +2,6 @@ set -euxo pipefail -stack build --resolver lts-20.23 async -eval `stack config env --resolver lts-20.23` +stack build --resolver lts-20.26 async +eval `stack config env --resolver lts-20.26` ghc Main.hs diff --git a/test/integration/tests/717-sdist-test/files/stack.yaml b/test/integration/tests/717-sdist-test/files/stack.yaml index 88087bd242..f3c6d4a1a4 100644 --- a/test/integration/tests/717-sdist-test/files/stack.yaml +++ b/test/integration/tests/717-sdist-test/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.23 +resolver: lts-20.26 packages: - package-with-th - package-with-working-th diff --git a/test/integration/tests/763-buildable-false/files/stack.yaml b/test/integration/tests/763-buildable-false/files/stack.yaml index 5a445ec68c..42d4ec589c 100644 --- a/test/integration/tests/763-buildable-false/files/stack.yaml +++ b/test/integration/tests/763-buildable-false/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-20.23 +resolver: lts-20.26 diff --git a/test/integration/tests/796-ghc-options/files/stack.yaml b/test/integration/tests/796-ghc-options/files/stack.yaml index 75d37941ad..68b2ef8ac5 100644 --- a/test/integration/tests/796-ghc-options/files/stack.yaml +++ b/test/integration/tests/796-ghc-options/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 ghc-options: "*": -DFOO ghc-options: -DBAR diff --git a/test/integration/tests/allow-newer-specific-packages/files/stack.yaml b/test/integration/tests/allow-newer-specific-packages/files/stack.yaml index 70f29fb58a..59a0245ec3 100644 --- a/test/integration/tests/allow-newer-specific-packages/files/stack.yaml +++ b/test/integration/tests/allow-newer-specific-packages/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.23 +resolver: lts-20.26 allow-newer: true allow-newer-deps: diff --git a/test/integration/tests/cabal-non-buildable-bug/Main.hs b/test/integration/tests/cabal-non-buildable-bug/Main.hs index bfce3a21d5..22d922bf7f 100644 --- a/test/integration/tests/cabal-non-buildable-bug/Main.hs +++ b/test/integration/tests/cabal-non-buildable-bug/Main.hs @@ -4,7 +4,7 @@ main :: IO () main = do -- Newer Cabal: dry run and building should succeed, because they'll -- both ignore the do-not-build - writeFile "stack.yaml" "resolver: ghc-9.2.7" + writeFile "stack.yaml" "resolver: ghc-9.2.8" stack ["build", "--dry-run"] stack ["build"] diff --git a/test/integration/tests/copy-bins-works/files/stack.yaml b/test/integration/tests/copy-bins-works/files/stack.yaml index d0c5ad4a73..5c34ca3d10 100644 --- a/test/integration/tests/copy-bins-works/files/stack.yaml +++ b/test/integration/tests/copy-bins-works/files/stack.yaml @@ -1,2 +1,2 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 copy-bins: true diff --git a/test/integration/tests/drop-packages/files/stack.yaml b/test/integration/tests/drop-packages/files/stack.yaml index 739cb69ec8..d7c1c091bf 100644 --- a/test/integration/tests/drop-packages/files/stack.yaml +++ b/test/integration/tests/drop-packages/files/stack.yaml @@ -1,3 +1,3 @@ -resolver: lts-20.23 +resolver: lts-20.26 drop-packages: - unliftio-core diff --git a/test/integration/tests/duplicate-package-ids/files/stack1.yaml b/test/integration/tests/duplicate-package-ids/files/stack1.yaml index 3dcb889d3f..518cb6ff68 100644 --- a/test/integration/tests/duplicate-package-ids/files/stack1.yaml +++ b/test/integration/tests/duplicate-package-ids/files/stack1.yaml @@ -1,2 +1,2 @@ -resolver: lts-20.23 +resolver: lts-20.26 packages: [] diff --git a/test/integration/tests/duplicate-package-ids/files/stack2.yaml b/test/integration/tests/duplicate-package-ids/files/stack2.yaml index 2cc43c7838..9171955713 100644 --- a/test/integration/tests/duplicate-package-ids/files/stack2.yaml +++ b/test/integration/tests/duplicate-package-ids/files/stack2.yaml @@ -1,3 +1,3 @@ -resolver: lts-20.23 +resolver: lts-20.26 packages: - auto-update-0.1.2.1 diff --git a/test/integration/tests/ghc-install-hooks/files/run.sh b/test/integration/tests/ghc-install-hooks/files/run.sh index 05d5f99382..669f2faed8 100755 --- a/test/integration/tests/ghc-install-hooks/files/run.sh +++ b/test/integration/tests/ghc-install-hooks/files/run.sh @@ -2,7 +2,7 @@ set -exu -stack_bin=$("$STACK_EXE" path --resolver ghc-9.2.7 --compiler-bin) +stack_bin=$("$STACK_EXE" path --resolver ghc-9.2.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.2.7 ghc -- --info -"$STACK_EXE" --no-install-ghc --resolver ghc-9.2.7 runghc foo.hs +"$STACK_EXE" --no-install-ghc --resolver ghc-9.2.8 ghc -- --info +"$STACK_EXE" --no-install-ghc --resolver ghc-9.2.8 runghc foo.hs diff --git a/test/integration/tests/haddock-options/files/stack.yaml b/test/integration/tests/haddock-options/files/stack.yaml index 968df1d7dc..f73ad276ba 100644 --- a/test/integration/tests/haddock-options/files/stack.yaml +++ b/test/integration/tests/haddock-options/files/stack.yaml @@ -2,7 +2,7 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-20.23 +resolver: lts-20.26 build: haddock-arguments: haddock-args: diff --git a/test/integration/tests/hpack-repo/files/stack.yaml b/test/integration/tests/hpack-repo/files/stack.yaml index 726d73cd71..e9f15bf504 100644 --- a/test/integration/tests/hpack-repo/files/stack.yaml +++ b/test/integration/tests/hpack-repo/files/stack.yaml @@ -1,6 +1,6 @@ packages: - . -resolver: lts-20.23 +resolver: lts-20.26 extra-deps: - git: https://github.com/NorfairKing/validity.git commit: d128cc30bc886e31ea7f8161fb7708c08b162937 diff --git a/test/integration/tests/init-omit-packages/Main.hs b/test/integration/tests/init-omit-packages/Main.hs index 3597cdbef8..52aec4a43f 100644 --- a/test/integration/tests/init-omit-packages/Main.hs +++ b/test/integration/tests/init-omit-packages/Main.hs @@ -5,8 +5,8 @@ import System.IO (readFile) main :: IO () main = do removeFileIgnore "stack.yaml" - stackErr ["init", "--resolver", "lts-20.23"] - stack ["init", "--resolver", "lts-20.23", "--omit-packages"] + stackErr ["init", "--resolver", "lts-20.26"] + stack ["init", "--resolver", "lts-20.26", "--omit-packages"] contents <- lines <$> readFile "stack.yaml" unless ("#- bad" `elem` contents) $ error "commented out 'bad' package was expected" diff --git a/test/integration/tests/lock-files/files/stack-1-extra b/test/integration/tests/lock-files/files/stack-1-extra index 5b46685d0d..a8df7eacb7 100644 --- a/test/integration/tests/lock-files/files/stack-1-extra +++ b/test/integration/tests/lock-files/files/stack-1-extra @@ -1,3 +1,3 @@ -resolver: lts-20.23 +resolver: lts-20.26 extra-deps: - acme-cuteboy-0.1.0.0 diff --git a/test/integration/tests/lock-files/files/stack-2-extras b/test/integration/tests/lock-files/files/stack-2-extras index c2c7ecfae3..f2ca3a6dfa 100644 --- a/test/integration/tests/lock-files/files/stack-2-extras +++ b/test/integration/tests/lock-files/files/stack-2-extras @@ -1,4 +1,4 @@ -resolver: lts-20.23 +resolver: lts-20.26 extra-deps: - acme-cuteboy-0.1.0.0 - acme-dont-1.1 diff --git a/test/integration/tests/module-added-multiple-times/files/stack.yaml b/test/integration/tests/module-added-multiple-times/files/stack.yaml index 95365002ed..d29f064b80 100644 --- a/test/integration/tests/module-added-multiple-times/files/stack.yaml +++ b/test/integration/tests/module-added-multiple-times/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.23 +resolver: lts-20.26 extra-deps: [] flags: {} extra-package-dbs: [] diff --git a/test/integration/tests/multi-test/files/stack.yaml b/test/integration/tests/multi-test/files/stack.yaml index 4768815ca3..c78875a2c0 100644 --- a/test/integration/tests/multi-test/files/stack.yaml +++ b/test/integration/tests/multi-test/files/stack.yaml @@ -4,4 +4,4 @@ packages: - sub-package - cyclic extra-deps: [] -resolver: lts-20.23 +resolver: lts-20.26 diff --git a/test/integration/tests/mutable-deps/files/stack.yaml b/test/integration/tests/mutable-deps/files/stack.yaml index 2236d087fc..706e8ba584 100644 --- a/test/integration/tests/mutable-deps/files/stack.yaml +++ b/test/integration/tests/mutable-deps/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.23 +resolver: lts-20.26 packages: - . extra-deps: diff --git a/test/integration/tests/nice-resolver-names/Main.hs b/test/integration/tests/nice-resolver-names/Main.hs index c9ac93ee1e..fa606f2066 100644 --- a/test/integration/tests/nice-resolver-names/Main.hs +++ b/test/integration/tests/nice-resolver-names/Main.hs @@ -8,7 +8,7 @@ import Data.List (stripPrefix) main :: IO () main = do - for_ ["lts-20.23", "nightly-2023-05-26"] $ \snapshot -> do + for_ ["lts-20.26", "nightly-2023-05-26"] $ \snapshot -> do stack ["init", "--force", "--resolver", snapshot] str <- readFile "stack.yaml" case mapMaybe (stripPrefix "resolver: ") $ lines str of diff --git a/test/integration/tests/no-rerun-tests/files/stack.yaml b/test/integration/tests/no-rerun-tests/files/stack.yaml index b461ea7a64..4324da7693 100644 --- a/test/integration/tests/no-rerun-tests/files/stack.yaml +++ b/test/integration/tests/no-rerun-tests/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 diff --git a/test/integration/tests/override-compiler/Main.hs b/test/integration/tests/override-compiler/Main.hs index 6a9fc3069d..d35baf0edc 100644 --- a/test/integration/tests/override-compiler/Main.hs +++ b/test/integration/tests/override-compiler/Main.hs @@ -4,4 +4,4 @@ import Control.Monad (unless) main :: IO () main = stackCheckStdout ["exec", "--", "ghc", "--numeric-version"] $ \ver -> -- get rid of the newline character - unless (concat (lines ver) == "9.2.7") $ error $ "Invalid version: " ++ show ver + unless (concat (lines ver) == "9.2.8") $ error $ "Invalid version: " ++ show ver diff --git a/test/integration/tests/override-compiler/files/stack.yaml b/test/integration/tests/override-compiler/files/stack.yaml index 73bc8c3d25..b0d2dacbd7 100644 --- a/test/integration/tests/override-compiler/files/stack.yaml +++ b/test/integration/tests/override-compiler/files/stack.yaml @@ -1,3 +1,3 @@ resolver: lts-13.10 -compiler: ghc-9.2.7 +compiler: ghc-9.2.8 packages: [] diff --git a/test/integration/tests/proper-rebuilds/files/stack.yaml b/test/integration/tests/proper-rebuilds/files/stack.yaml index b461ea7a64..4324da7693 100644 --- a/test/integration/tests/proper-rebuilds/files/stack.yaml +++ b/test/integration/tests/proper-rebuilds/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 diff --git a/test/integration/tests/relative-script-snapshots/files/subdir/snapshot.yaml b/test/integration/tests/relative-script-snapshots/files/subdir/snapshot.yaml index 3d605428ac..67f0936282 100644 --- a/test/integration/tests/relative-script-snapshots/files/subdir/snapshot.yaml +++ b/test/integration/tests/relative-script-snapshots/files/subdir/snapshot.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 name: snapshot packages: - acme-missiles-0.3@rev:0 diff --git a/test/integration/tests/script-extra-dep/files/script.hs b/test/integration/tests/script-extra-dep/files/script.hs index 95c7200129..ad8252e5d9 100644 --- a/test/integration/tests/script-extra-dep/files/script.hs +++ b/test/integration/tests/script-extra-dep/files/script.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack --- stack --resolver ghc-9.2.7 script --extra-dep acme-missiles-0.3@rev:0 --extra-dep stm-2.5.0.2@rev:0 +-- stack --resolver ghc-9.2.8 script --extra-dep acme-missiles-0.3@rev:0 --extra-dep stm-2.5.0.2@rev:0 import Acme.Missiles main :: IO () diff --git a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-extra-dep.yaml b/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-extra-dep.yaml index ca9b7de5b2..3b84ff23e3 100644 --- a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-extra-dep.yaml +++ b/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-extra-dep.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 extra-deps: - async-2.1.1.1 - stm-2.1.2.2 diff --git a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/snapshot.yaml b/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/snapshot.yaml index 02d6dd23c2..21fb2a89a0 100644 --- a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/snapshot.yaml +++ b/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/snapshot.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.2.7 +resolver: ghc-9.2.8 name: hackage-revisions-are-annoying packages: - async-2.1.1.1 diff --git a/test/integration/tests/upload/files/stack.yaml b/test/integration/tests/upload/files/stack.yaml index 41da624363..b7f596c779 100644 --- a/test/integration/tests/upload/files/stack.yaml +++ b/test/integration/tests/upload/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.23 +resolver: lts-20.26 packages: - . diff --git a/test/integration/tests/watched-files/files/stack.yaml b/test/integration/tests/watched-files/files/stack.yaml index c2f80207e5..fc9172fa2f 100644 --- a/test/integration/tests/watched-files/files/stack.yaml +++ b/test/integration/tests/watched-files/files/stack.yaml @@ -1 +1 @@ -resolver: lts-20.23 +resolver: lts-20.26