diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 5465350abf..46afb07a63 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,7 +3,7 @@ "build": { "dockerfile": "GHC.Dockerfile", "args": { - "GHC_VERSION": "9.6.4", + "GHC_VERSION": "9.6.5", "HLS_VERSION": "2.7.0.0", "USE_ZSH_FOR_ROOT": "unset-to-use-ash", "SET_LANG": "C.UTF-8", diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 22eae360d6..3e1f356ee5 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -16,12 +16,13 @@ on: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# As of 1 February 2024, ubuntu-latest, windows-latest and macos-latest come -# with Stack 2.13.1 and GHC 9.8.1. 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 6 May 2024, ubuntu-latest and windows-latest come with Stack 2.15.5 and +# GHC 9.8.2. However, macos-13 and macos-latest do not come with Haskell tools. +# 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: @@ -37,7 +38,7 @@ jobs: - os: windows-latest release-args: "" cache-bust: "2024-01-20" - - os: macos-12 + - os: macos-13 release-args: "" cache-bust: "2024-01-20" # macos-latest provides macOS/AArch64 (M1) @@ -67,9 +68,9 @@ jobs: run: | set -ex - if [[ "${{ matrix.os }}" == "macos-latest" ]] + if [[ "${{ matrix.os }}" == "macos-13" || "${{ matrix.os }}" == "macos-latest" ]] then - # macos-latest does not include Haskell tools as at 2024-04-25. + # macos-13 and macos-latest do not include Haskell tools as at 2024-05-06. curl -sSL https://get.haskellstack.org/ | sh fi diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index ec4df102fc..410574141b 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -9,8 +9,8 @@ on: - rc/** workflow_dispatch: -# As of 1 February 2024, ubuntu-latest, windows-latest and macos-latest come -# with Stack 2.13.1 and GHC 9.8.1. +# As of 6 May 2024, ubuntu-latest and windows-latest come with Stack 2.15.5 and +# GHC 9.8.2. However, macos-latest does not come with Haskell tools. jobs: pedantic: @@ -76,7 +76,7 @@ jobs: if [[ "${{ matrix.os }}" == "macos-latest" ]] then - # macos-latest does not include Haskell tools as at 2024-04-25. + # macos-latest does not include Haskell tools as at 2024-05-06. curl -sSL https://get.haskellstack.org/ | sh fi diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 290a7cd2ac..2f0da8e2a9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -285,9 +285,9 @@ compatibility with a range of versions of GHC that a library package (such as Stack aims to depend on well-known packages. The specific versions on which it depends at any time are specified by `package.yaml` and `stack.yaml`. It does not aim to be compatible with more than one version of the `Cabal` package at -any time. At the time of writing (February 2024) the package versions are -primarily ones in Stackage snapshot LTS Haskell 22.7 (for GHC 9.6.4), together -with extra-deps to depend on the latest version of `pantry` and `process`. +any time. At the time of writing (May 2024) the package versions are primarily +ones in Stackage snapshot LTS Haskell 22.21 (for GHC 9.6.5), together with +extra-deps to depend on the latest version of `pantry` and `tar`. A Stack executable makes use of Cabal (the library) through a small 'Setup' executable that it compiles from Haskell source code. The executable compiles @@ -607,7 +607,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.6.4. The tool is configured by the contents of the `.stan.toml` file. +GHC 9.6.5. The tool is configured by the contents of the `.stan.toml` file. This workflow will run if: diff --git a/cabal.config b/cabal.config index 28d8b6f8ff..bf1a63432a 100644 --- a/cabal.config +++ b/cabal.config @@ -1,6 +1,6 @@ constraints: - , Cabal ==3.10.1.0 - , Cabal-syntax ==3.10.1.0 + , Cabal ==3.10.3.0 + , Cabal-syntax ==3.10.3.0 , Glob ==0.10.2 , OneTuple ==0.4.1.1 , QuickCheck ==2.14.3 @@ -22,18 +22,18 @@ constraints: , attoparsec-aeson ==2.1.0.0 , attoparsec-iso8601 ==1.1.0.1 , auto-update ==0.1.6 - , base ==4.18.2.0 + , base ==4.18.2.1 , base-compat ==0.13.1 , base-compat-batteries ==0.13.1 - , base-orphans ==0.9.1 + , base-orphans ==0.9.2 , base16-bytestring ==1.0.2.0 , base64-bytestring ==1.2.1.0 , basement ==0.0.16 - , bifunctors ==5.6.1 + , bifunctors ==5.6.2 , binary ==0.8.9.1 , bitvec ==1.1.5.0 , blaze-builder ==0.4.2.3 - , blaze-html ==0.9.1.2 + , blaze-html ==0.9.2.0 , blaze-markup ==0.8.3.0 , byteorder ==1.0.4 , bytestring ==0.11.5.3 @@ -55,7 +55,7 @@ constraints: , cryptohash-sha256 ==0.11.102.1 , crypton ==0.34 , crypton-conduit ==0.2.3 - , crypton-connection ==0.3.1 + , crypton-connection ==0.3.2 , crypton-x509 ==1.7.6 , crypton-x509-store ==1.6.9 , crypton-x509-system ==1.6.7 @@ -63,8 +63,8 @@ constraints: , data-default-class ==0.1.2.0 , data-fix ==0.3.2 , deepseq ==1.4.8.1 - , digest ==0.0.2.0 - , directory ==1.3.8.1 + , digest ==0.0.2.1 + , directory ==1.3.8.4 , distributive ==0.6.2.1 , dlist ==1.0 , easy-file ==0.2.5 @@ -73,26 +73,26 @@ constraints: , exceptions ==0.10.7 , extra ==1.7.14 , fast-logger ==3.2.2 - , file-embed ==0.0.15.0 + , file-embed ==0.0.16.0 , filelock ==0.1.1.7 - , filepath ==1.4.200.1 + , filepath ==1.4.300.1 , fsnotify ==0.4.1.0 , generic-deriving ==1.14.5 , generically ==0.1.1 , ghc-bignum ==1.3 - , ghc-boot ==9.6.4 - , ghc-boot-th ==9.6.4 + , ghc-boot ==9.6.5 + , ghc-boot-th ==9.6.5 , ghc-prim ==0.10.0 , githash ==0.1.7.0 , hackage-security ==0.6.2.4 - , hashable ==1.4.3.0 + , hashable ==1.4.4.0 , hi-file-parser ==0.1.6.0 , hinotify ==0.4.1 , hourglass ==0.2.12 , hpack ==0.36.0 , hpc ==0.6.2.0 , http-api-data ==0.5.1 - , http-client ==0.7.16 + , http-client ==0.7.17 , http-client-tls ==0.3.6.3 , http-conduit ==2.3.8.3 , http-download ==0.2.1.0 @@ -104,7 +104,8 @@ constraints: , integer-gmp ==1.1 , integer-logarithms ==1.0.3.1 , iproute ==1.7.12 - , libyaml ==0.1.2 + , libyaml ==0.1.4 + , libyaml-clib ==0.2.5 , lift-type ==0.1.1.1 , lifted-base ==0.2.3.12 , lukko ==0.1.1.3 @@ -112,13 +113,13 @@ constraints: , memory ==0.18.0 , microlens ==0.4.13.1 , microlens-mtl ==0.2.0.3 - , microlens-th ==0.4.3.14 + , microlens-th ==0.4.3.15 , mime-types ==0.1.2.0 , mintty ==0.1.4 , monad-control ==1.0.3.1 , monad-logger ==0.3.40 , monad-loops ==0.4.3 - , mono-traversable ==1.0.15.3 + , mono-traversable ==1.0.17.0 , mtl ==2.3.1 , mtl-compat ==0.2.2 , mustache ==2.4.2 @@ -130,6 +131,7 @@ constraints: , open-browser ==0.2.1.0 , optparse-applicative ==0.18.1.0 , optparse-simple ==0.1.1.4 + , os-string ==2.0.2.1 , pantry ==0.10.0 , parsec ==3.1.16.1 , parser-combinators ==1.3.0 @@ -137,16 +139,16 @@ constraints: , path-io ==1.8.1 , path-pieces ==0.2.1 , pem ==0.2.4 - , persistent ==2.14.6.0 + , persistent ==2.14.6.1 , persistent-sqlite ==2.13.3.0 , persistent-template ==2.12.0.0 , pretty ==1.1.3.6 , prettyprinter ==1.7.1 , prettyprinter-ansi-terminal ==1.1.3 , primitive ==0.8.0.0 - , process ==1.6.18.0 + , process ==1.6.19.0 , project-template ==0.2.1.0 - , random ==1.2.1.1 + , random ==1.2.1.2 , resource-pool ==0.4.0.0 , resourcet ==1.3.0 , retry ==0.9.3.1 @@ -158,7 +160,7 @@ constraints: , safe-exceptions ==0.1.7.4 , scientific ==0.3.7.0 , semialign ==1.3 - , semigroupoids ==6.0.0.1 + , semigroupoids ==6.0.1 , silently ==1.2.5.3 , socks ==0.6.1 , split ==0.2.5 @@ -170,7 +172,7 @@ constraints: , streaming-commons ==0.2.2.6 , strict ==0.5 , tagged ==0.8.8 - , tar ==0.5.1.1 + , tar ==0.6.2.0 , tar-conduit ==0.4.1 , template-haskell ==2.20.0.0 , temporary ==1.3 @@ -178,7 +180,7 @@ constraints: , text-metrics ==0.3.2 , text-short ==0.1.5 , th-abstraction ==0.5.0.0 - , th-compat ==0.1.4 + , th-compat ==0.1.5 , th-lift ==0.8.4 , th-lift-instances ==0.1.20 , these ==1.2 @@ -191,7 +193,7 @@ constraints: , typed-process ==0.2.11.1 , unix ==2.8.4.0 , unix-compat ==0.7.1 - , unix-time ==0.4.11 + , unix-time ==0.4.12 , unliftio ==0.2.25.0 , unliftio-core ==0.2.1.0 , unordered-containers ==0.2.20 @@ -202,5 +204,5 @@ constraints: , vector-stream ==0.1.0.1 , witherable ==0.4.2 , yaml ==0.11.11.2 - , zip-archive ==0.4.3 + , zip-archive ==0.4.3.2 , zlib ==0.6.3.0 diff --git a/cabal.project b/cabal.project index c7afc2d773..3458963419 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-22.7/cabal.config. +-- https://www.stackage.org/lts-22.21/cabal.config. -- -with-compiler: ghc-9.6.4 +with-compiler: ghc-9.6.5 import: cabal.config packages: . diff --git a/doc/GUIDE.md b/doc/GUIDE.md index ee9a4a73a0..a121b8adfc 100644 --- a/doc/GUIDE.md +++ b/doc/GUIDE.md @@ -248,7 +248,7 @@ this: ~~~yaml resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/11.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/21.yaml packages: - . ~~~ @@ -256,7 +256,7 @@ packages: The value of the [`resolver`](yaml_configuration.md#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 22.11](https://www.stackage.org/lts-22.11), which implies GHC 9.6.4 +[LTS Haskell 22.21](https://www.stackage.org/lts-22.21), which implies GHC 9.6.5 (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. @@ -980,7 +980,7 @@ stack purge stack build :helloworld-test helloworld> configure (lib + test) Configuring helloworld-0.1.0.0... -helloworld> build (lib + test) with ghc-9.6.4 +helloworld> build (lib + test) with ghc-9.6.5 Preprocessing library for helloworld-0.1.0.0.. Building library for helloworld-0.1.0.0.. [1 of 2] Compiling Lib @@ -1298,7 +1298,7 @@ yields output like: ~~~text Run from outside a project, using implicit global project config -Using latest snapshot resolver: lts-22.7 +Using latest snapshot resolver: lts-22.21 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 8542f491b1..5df3a67f16 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 snapshot is used that references a different version of GHC, then GHCup must be used to install it (if GHCup has -not already installed that version). For example, to use `snapshot: lts-22.7` -(GHC 9.6.4), the command `ghcup install ghc 9.6.4` must have been used to -install GHC 9.6.4. That may be a minor inconvenience for some people, as one the +not already installed that version). For example, to use `snapshot: lts-22.21` +(GHC 9.6.5), the command `ghcup install ghc 9.6.5` must have been used to +install GHC 9.6.5. 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 82c996a21b..5f86fb7b2f 100644 --- a/doc/custom_snapshot.md +++ b/doc/custom_snapshot.md @@ -18,8 +18,8 @@ available in snapshots to ensure reproducibility. for snapshot specification. ~~~yaml -snapshot: lts-22.7 # Inherits GHC version and package set -compiler: ghc-9.6.3 # Overwrites GHC version in the snapshot, optional +snapshot: lts-22.21 # Inherits GHC version and package set +compiler: ghc-9.6.4 # Overwrites GHC version in the snapshot, optional # Additional packages, follows extra-deps syntax packages: @@ -62,35 +62,35 @@ custom snapshot, due to Stack sharing snapshot packages whenever possible. ### Overriding the compiler -The following snapshot specification will be identical to `lts-22.7`, but -instead use `ghc-9.6.3` instead of `ghc-9.6.4`: +The following snapshot specification will be identical to `lts-22.21`, but +instead use `ghc-9.6.4` instead of `ghc-9.6.5`: ~~~yaml -snapshot: lts-22.7 -compiler: ghc-9.6.3 +snapshot: lts-22.21 +compiler: ghc-9.6.4 ~~~ ### Dropping packages -The following snapshot specification will be identical to `lts-22.7`, but +The following snapshot specification will be identical to `lts-22.21`, but without the `text` package in our snapshot. Removing this package will cause all the packages that depend on `text` to be unbuildable, but they will still be present in the snapshot. ~~~yaml -snapshot: lts-22.7 +snapshot: lts-22.21 drop-packages: - text ~~~ ### Hiding packages -The following snapshot specification will be identical to `lts-22.7`, but the +The following snapshot specification will be identical to `lts-22.21`, but the `text` package will be hidden when registering. This will affect, for example, the import parser in the script command. ~~~yaml -snapshot: lts-22.7 +snapshot: lts-22.21 hidden: - text ~~~ @@ -100,11 +100,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-22.7`, but +The following snapshot specification will be identical to `lts-22.21`, but provides `-O1` as a ghc-option for `text`: ~~~yaml -snapshot: lts-22.7 +snapshot: lts-22.21 packages: - text-2.0.2 ghc-options: @@ -123,11 +123,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-22.7`, but +following snapshot specification will be identical to `lts-22.21`, but it enables the `developer` Cabal flag: ~~~yaml -snapshot: lts-22.7 +snapshot: lts-22.21 packages: - text-2.0.2 flags: diff --git a/doc/faq.md b/doc/faq.md index daa129908f..4f61de2f9b 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 _snapshot_. This may be something like `lts-22.7`, which is from +the _snapshot_. This may be something like `lts-22.21`, which is from [Stackage](https://www.stackage.org/). The [user's guide](GUIDE.md) discusses the snapshot in more detail. @@ -76,11 +76,11 @@ You can make tweaks to a snapshot by modifying the `extra-deps` configuration value in your `stack.yaml` file, e.g.: ~~~yaml -snapshot: lts-22.7 +snapshot: lts-22.21 packages: - . extra-deps: -- text-2.0.2@rev:1 +- text-2.1.1@rev:0 ~~~ ## I need to use a package (or version of a package) that is not available on Hackage, what should I do? @@ -91,7 +91,7 @@ Add it to the directory where your `stack.yaml` file lives, e.g. ~~~yaml -snapshot: lts-22.7 +snapshot: lts-22.21 packages: - . extra-deps: diff --git a/doc/install_and_upgrade.md b/doc/install_and_upgrade.md index af07c9f11d..9779b1f4a2 100644 --- a/doc/install_and_upgrade.md +++ b/doc/install_and_upgrade.md @@ -410,11 +410,14 @@ GitHub repository. |GHC version|LLVM versions| |-----------|-------------| |9.8.2 |11 to 15 | - |9.6.4 |11 to 15 | + |9.6.5 |11 to 15 | |9.4.8 |10 to 14 | |9.2.8 |9 to 12 | |9.0.2 |9, 10 or 12 | |8.10.7 |9 to 12 | + |8.8.4 |7 | + |8.6.5 |6 | + |8.4.4 |5 | ### Using Homebrew @@ -490,8 +493,8 @@ GitHub repository. !!! info "Stack root" By default, the Windows installer will set the Stack root by setting the - `STACK_ROOT` environment variable to `C:\sr`. - + `STACK_ROOT` environment variable to `C:\sr`. + !!! warning "Long user PATH environment variable" The Windows installer for Stack 2.9.1, 2.9.3 and 2.11.1 (only) will diff --git a/doc/list_command.md b/doc/list_command.md index d506a88cd5..c0d1335c6a 100644 --- a/doc/list_command.md +++ b/doc/list_command.md @@ -45,17 +45,17 @@ Error: [S-4926] pantry, pretty, pasty, xattr, alloy, para, pappy, alure, polar and factory. -stack --snapshot lts-22.7 list base unix Win32 acme-missiles pantry +stack --snapshot lts-22.21 list base unix Win32 acme-missiles pantry Error: [S-4926] * Package does not appear in snapshot (directly or indirectly): acme-missiles. -stack --snapshot lts-22.7 list base unix Win32 pantry -base-4.18.2.0 +stack --snapshot lts-22.21 list base unix Win32 pantry +base-4.18.2.1 unix-2.8.4.0 Win32-2.13.3.0 -pantry-0.9.3.1 +pantry-0.9.3.2 -stack --snapshot lts-22.7 list +stack --snapshot lts-22.21 list AC-Angle-1.0 ALUT-2.4.0.3 ... diff --git a/doc/script_command.md b/doc/script_command.md index c94e94a5af..ef0e5e2c04 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 `--snapshot` option). For example: ~~~text -stack script --snapshot lts-22.7 MyScript.hs +stack script --snapshot lts-22.21 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 --snapshot lts-22.7 script --package acme-missiles --compile MyScript.hs -- "Don't panic!" "Duck and cover!" +stack --snapshot lts-22.21 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 19322295f0..b00d375ee2 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 --snapshot lts-22.7 --package turtle +-- stack script --snapshot lts-22.21 --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 22.7 snapshot (`--snapshot lts-22.7`) and ensuring the +LTS Haskell 22.21 snapshot (`--snapshot lts-22.21`) 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-22.7` provides `turtle-1.6.2`). +snapshot (`lts-22.21` provides `turtle-1.6.2`). ## 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 - --snapshot lts-22.7 + --snapshot lts-22.21 -- +RTS -s -RTS -} @@ -132,7 +132,7 @@ main = do is equivalent to the following command at the command line: ~~~text -stack script --snapshot lts-22.7 -- MyScript.hs arg1 arg2 +RTS -s -RTS +stack script --snapshot lts-22.21 -- 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 - --snapshot lts-22.7 + --snapshot lts-22.21 --package turtle --package "stm async" --package http-client,http-conduit @@ -191,7 +191,7 @@ which makes use of the joke package ~~~haskell {- stack script - --snapshot lts-22.7 + --snapshot lts-22.21 --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 --snapshot lts-22.7 --package acme-missiles --no-run --compile -- Script.hs` +`stack script --snapshot lts-22.21 --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 - --snapshot lts-22.7 + --snapshot lts-22.21 --package base --package turtle -- @@ -262,7 +262,7 @@ it. Here is an example: {- stack exec ghci --install-ghc - --snapshot lts-22.7 + --snapshot lts-22.21 --package turtle -} ~~~ diff --git a/doc/stack_yaml_vs_cabal_package_file.md b/doc/stack_yaml_vs_cabal_package_file.md index b91a282fe0..5e8ec1c611 100644 --- a/doc/stack_yaml_vs_cabal_package_file.md +++ b/doc/stack_yaml_vs_cabal_package_file.md @@ -64,9 +64,9 @@ requires that you have chosen a specific version for each package available. The most common means by which this set of packages is defined is via a snapshot provided by Stackage. For example, if you go to the page -, you will see a list of 3,341 packages at -specific version numbers. When you then specify `snapshot: lts-22.7` or, -alternatively, `resolver: lts-22.7`, you're telling Stack to use those package +, you will see a list of 3,342 packages at +specific version numbers. When you then specify `snapshot: lts-22.21` or, +alternatively, `resolver: lts-22.21`, you're telling Stack to use those package versions in resolving dependencies down to specific versions of packages. Sometimes a snapshot doesn't have all of the packages that you want. Or you want diff --git a/doc/yaml_configuration.md b/doc/yaml_configuration.md index ef2746f390..bbd72c93d8 100644 --- a/doc/yaml_configuration.md +++ b/doc/yaml_configuration.md @@ -115,10 +115,10 @@ installation, and various settings like build flags. It is also called a resolver since a snapshot states how dependencies are resolved. There are currently four snapshot types: -* LTS Haskell snapshots, e.g. `snapshot: lts-22.7` -* Stackage Nightly snapshots, e.g. `snapshot: nightly-2023-12-16` +* LTS Haskell snapshots, e.g. `snapshot: lts-22.21` +* Stackage Nightly snapshots, e.g. `snapshot: nightly-2024-05-06` * No snapshot, just use packages shipped with the compiler. For GHC this looks - like `snapshot: ghc-9.6.4` + like `snapshot: ghc-9.6.5` * Custom snapshot, via a URL or relative file path. For further information, see the [snapshot and package location](pantry.md) documentation. @@ -723,12 +723,12 @@ Command line equivalent (takes precedence): `--compiler` option Overrides the compiler version in the snapshot. Note that the `compiler-check` flag also applies to the version numbers. This uses the same syntax as compiler -snapshots like `ghc-9.6.3`. This can be used to override the compiler for a +snapshots like `ghc-9.6.5`. This can be used to override the compiler for a Stackage snapshot, like this: ~~~yaml -snapshot: lts-22.7 -compiler: ghc-9.6.3 +snapshot: lts-22.21 +compiler: ghc-9.6.4 compiler-check: match-exact ~~~ diff --git a/etc/scripts/build-stack-installer.hs b/etc/scripts/build-stack-installer.hs index 93a6ae5d85..e9608008e9 100644 --- a/etc/scripts/build-stack-installer.hs +++ b/etc/scripts/build-stack-installer.hs @@ -1,5 +1,5 @@ {- stack script - --resolver lts-22.7 + --resolver lts-22.21 --install-ghc --package nsis -} diff --git a/etc/scripts/release-linux-aarch64.hs b/etc/scripts/release-linux-aarch64.hs index b0b3bbfd73..bcbbd36930 100644 --- a/etc/scripts/release-linux-aarch64.hs +++ b/etc/scripts/release-linux-aarch64.hs @@ -1,5 +1,5 @@ {- stack script - --resolver lts-22.7 + --resolver lts-22.21 --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 22.0 does not include boot packages --- directly. As GHC 9.6.4 boot packages Cabal and Cabal-syntax expose modules +-- the snapshot. Stackage LTS Haskell 22.21 does not include boot packages +-- directly. As GHC 9.6.5 boot packages Cabal and Cabal-syntax expose modules -- with the same names, the language extension PackageImports is required. -- EXPERIMENTAL diff --git a/etc/scripts/release.hs b/etc/scripts/release.hs index df79730818..b42985a777 100644 --- a/etc/scripts/release.hs +++ b/etc/scripts/release.hs @@ -1,5 +1,5 @@ {- stack script - --resolver lts-22.7 + --resolver lts-22.21 --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 22.0 does not include boot packages --- directly. As GHC 9.6.4 boot packages Cabal and Cabal-syntax expose modules +-- the snapshot. Stackage LTS Haskell 22.21 does not include boot packages +-- directly. As GHC 9.6.5 boot packages Cabal and Cabal-syntax expose modules -- with the same names, the language extension PackageImports is required. -- EXPERIMENTAL diff --git a/src/Stack/Build/Haddock.hs b/src/Stack/Build/Haddock.hs index a73894dbd0..5db54bdc5c 100644 --- a/src/Stack/Build/Haddock.hs +++ b/src/Stack/Build/Haddock.hs @@ -273,7 +273,7 @@ generateHaddockIndex descr bco dumpPackages docRelFP destDir = do compInterfaceDirsAndFiles <- do -- It is possible that the *.haddock file specified by the -- haddock-interfaces key for an installed package may not exist. For - -- example, with GHC 9.6.4 on Windows, there is no + -- example, with GHC 9.6.5 on Windows, there is no -- -- ${pkgroot}/../doc/html/libraries/rts-1.0.2\rts.haddock (srcInterfaceSubDirs, _) <- doesDirExist srcInterfaceDir >>= \case diff --git a/src/Stack/Constants.hs b/src/Stack/Constants.hs index 3fd767bfd5..d53a52210c 100644 --- a/src/Stack/Constants.hs +++ b/src/Stack/Constants.hs @@ -262,7 +262,7 @@ wiredInPackages = case mparsed of -- A magic package , "integer-gmp" -- No longer magic > 1.0.3.0 (GHC >= 9.0) and deprecated in favour of - -- ghc-bignum. With GHC 9.6.4 at least, there seems to be no problem in + -- ghc-bignum. With GHC 9.6.5 at least, there seems to be no problem in -- using it. , "integer-simple" -- A magic package @@ -277,7 +277,7 @@ wiredInPackages = case mparsed of -- if they were defined in modules all sharing a common package -- interactive. See 'Note [The interactive package]' at -- https://gitlab.haskell.org/ghc/ghc/-/blob/master/compiler/GHC/Runtime/Context.hs - -- With GHC 9.6.4 at least, there seems to be no problem in using it. + -- With GHC 9.6.5 at least, there seems to be no problem in using it. ] -- | Just to avoid repetition and magic strings. diff --git a/src/Stack/Init.hs b/src/Stack/Init.hs index 401295edaa..6ba3b0cc8d 100644 --- a/src/Stack/Init.hs +++ b/src/Stack/Init.hs @@ -426,9 +426,9 @@ renderStackYaml p ignoredPackages dupPackages = , "A snapshot resolver dictates the compiler version and the set of packages" , "to be used for project dependencies. For example:" , "" - , "snapshot: lts-22.7" - , "snapshot: nightly-2024-01-20" - , "snapshot: ghc-9.6.4" + , "snapshot: lts-22.21" + , "snapshot: nightly-2024-05-06" + , "snapshot: ghc-9.6.5" , "" , "The location of a snapshot can be provided as a file or url. Stack assumes" , "a snapshot provided as a file might change, whereas a url resource does not." diff --git a/src/Stack/Options/SetupParser.hs b/src/Stack/Options/SetupParser.hs index dc5d544bdf..8d54783ee0 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.6.4. (default: install \ + <> OA.help "Version of GHC to install, e.g. 9.6.5. (default: install \ \the version implied by the snapshot)" )) <*> OA.boolFlags False diff --git a/stack-ghc-9.8.2.yaml b/stack-ghc-9.8.2.yaml index 81ea379977..86a8861bb8 100644 --- a/stack-ghc-9.8.2.yaml +++ b/stack-ghc-9.8.2.yaml @@ -1,11 +1,11 @@ # This is an experimental project-level configuration, to see if Stack can be # built with GHC 9.8.2. -snapshot: nightly-2024-04-20 # GHC 9.8.2 +snapshot: nightly-2024-05-06 # GHC 9.8.2 docker: enable: false - repo: quay.io/benz0li/ghc-musl:9.8.1 + repo: quay.io/benz0li/ghc-musl:9.8.2 nix: # --nix on the command-line to enable. @@ -14,12 +14,5 @@ nix: - unzip flags: - hackage-security: - cabal-syntax: true stack: developer-mode: true - zlib: - # On Windows, pkg-config.exe is not provided with MSYS2 'out of the box', - # although it can be installed with pacman - # (https://packages.msys2.org/base/pkgconf) - pkg-config: false diff --git a/stack-ghc-9.8.2.yaml.lock b/stack-ghc-9.8.2.yaml.lock index 907fa66a8c..385d887430 100644 --- a/stack-ghc-9.8.2.yaml.lock +++ b/stack-ghc-9.8.2.yaml.lock @@ -6,7 +6,7 @@ packages: [] snapshots: - completed: - sha256: 0a88ee29d0bd8bb26573f3b666062790d2981cdea23daa52398d43cb8719452c - size: 625136 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2024/4/20.yaml - original: nightly-2024-04-20 + sha256: b66176d92f4e55079a946948d23fc80bf68fb328e23d1066ed9f73a609a3d8b8 + size: 631258 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2024/5/6.yaml + original: nightly-2024-05-06 diff --git a/stack.yaml b/stack.yaml index 97d521b109..d8bf0cf2c8 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,23 +1,14 @@ -snapshot: lts-22.7 # GHC 9.6.4 - -packages: -- . +snapshot: lts-22.21 # GHC 9.6.5 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 -# Dependency of tar >= 0.6.2.0: -- os-string-2.0.2@sha256:32fa47f8345a2c0662fb602fc42e4b674e41ec48079b68bdecb4b6f68032c24e,3259 +# lts-22.21 provides pantry-0.9.3.2. - pantry-0.10.0@sha256:6f99ee8d7cfeeb0e2513638618acf80c72d018e7f10120048fa120a409b9dcd2,7864 -# GHC 9.6.4 comes with process-1.6.17.0, which can segfault on macOS. -- process-1.6.18.0@sha256:cd0a3e0376b5a8525983d3131a31e52f9ffefc278ce635eec45a9d3987b8be3e,3025 -# lts-22.7 provides tar-0.5.1.1, which does not support Unicode filenames: +# lts-22.21 provides tar-0.5.1.1, which does not support Unicode filenames: - tar-0.6.2.0@sha256:619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba,4576 docker: enable: false - repo: quay.io/benz0li/ghc-musl:9.6.4 + repo: quay.io/benz0li/ghc-musl:9.6.5 nix: # --nix on the command-line to enable. @@ -26,7 +17,5 @@ nix: - unzip flags: - hackage-security: - cabal-syntax: true stack: developer-mode: true diff --git a/stack.yaml.lock b/stack.yaml.lock index a5c58494e1..2acc2bed4b 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -4,20 +4,6 @@ # https://docs.haskellstack.org/en/stable/lock_files packages: -- completed: - hackage: Cabal-3.10.1.0@sha256:6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94,12316 - pantry-tree: - sha256: 3d175ab2e29f17494599bf5844d0037d01fd04287ac5d50c5c788b0633a8ee6f - size: 9223 - original: - hackage: Cabal-3.10.1.0@sha256:6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94,12316 -- completed: - hackage: os-string-2.0.2@sha256:32fa47f8345a2c0662fb602fc42e4b674e41ec48079b68bdecb4b6f68032c24e,3259 - pantry-tree: - sha256: 5b1dbaf1663005907462032997264b7942befb9fc108491c1fdd5e488ac0817e - size: 2217 - original: - hackage: os-string-2.0.2@sha256:32fa47f8345a2c0662fb602fc42e4b674e41ec48079b68bdecb4b6f68032c24e,3259 - completed: hackage: pantry-0.10.0@sha256:6f99ee8d7cfeeb0e2513638618acf80c72d018e7f10120048fa120a409b9dcd2,7864 pantry-tree: @@ -25,13 +11,6 @@ packages: size: 2722 original: hackage: pantry-0.10.0@sha256:6f99ee8d7cfeeb0e2513638618acf80c72d018e7f10120048fa120a409b9dcd2,7864 -- 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: tar-0.6.2.0@sha256:619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba,4576 pantry-tree: @@ -41,7 +20,7 @@ packages: hackage: tar-0.6.2.0@sha256:619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba,4576 snapshots: - completed: - sha256: 7b975b104cb3dbf0c297dfd01f936a4d2ee523241dd0b1ae960522b833fe3027 - size: 714096 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/7.yaml - original: lts-22.7 + sha256: b146f371d1a90abbd2aeae1da10f776951046be50eae55a6fe93548a74fcc0dd + size: 713338 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/21.yaml + original: lts-22.21 diff --git a/tests/integration/lib/StackTest.hs b/tests/integration/lib/StackTest.hs index 2e50c61204..6da5d53ac7 100644 --- a/tests/integration/lib/StackTest.hs +++ b/tests/integration/lib/StackTest.hs @@ -362,7 +362,7 @@ isMacOSX = os == "darwin" -- the main @stack.yaml@. -- defaultSnapshotArg :: String -defaultSnapshotArg = "--snapshot=lts-22.7" +defaultSnapshotArg = "--snapshot=lts-22.21" -- | 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 5a951d93fd..a30ded96d8 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.6.4 +compiler: ghc-9.6.5 name: my-snapshot packages: - mtl-2.3.1 diff --git a/tests/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml b/tests/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml index 7a51eb863f..9a0000951c 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 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 dfaa92091d..8f64b095be 100644 --- a/tests/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml +++ b/tests/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml @@ -1,4 +1,4 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 f4bff484c0..f0af9b9b87 100644 --- a/tests/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml +++ b/tests/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml @@ -1,4 +1,4 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 43d55c689c..f27e913ef6 100644 --- a/tests/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml +++ b/tests/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml @@ -1,4 +1,4 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 d3ca44cf59..155c0c3d69 100644 --- a/tests/integration/tests/1337-unicode-everywhere/files/stack.yaml +++ b/tests/integration/tests/1337-unicode-everywhere/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 d3c53c427e..d02e30be2d 100644 --- a/tests/integration/tests/1438-configure-options/files/stack-everything.yaml +++ b/tests/integration/tests/1438-configure-options/files/stack-everything.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 eaed9cef67..cc8817a4e8 100644 --- a/tests/integration/tests/1438-configure-options/files/stack-locals.yaml +++ b/tests/integration/tests/1438-configure-options/files/stack-locals.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 b65e96343a..23f6e3d24d 100644 --- a/tests/integration/tests/1438-configure-options/files/stack-name.yaml +++ b/tests/integration/tests/1438-configure-options/files/stack-name.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 f9a7478eec..700e25c3e1 100644 --- a/tests/integration/tests/1438-configure-options/files/stack-targets.yaml +++ b/tests/integration/tests/1438-configure-options/files/stack-targets.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 d3ca44cf59..155c0c3d69 100644 --- a/tests/integration/tests/1659-skip-component/files/stack.yaml +++ b/tests/integration/tests/1659-skip-component/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 7fe5802839..46bd6f9fe8 100644 --- a/tests/integration/tests/1884-url-to-tarball/files/stack.yaml +++ b/tests/integration/tests/1884-url-to-tarball/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 extra-deps: - location: https://hackage.haskell.org/package/half-0.2.2.3/half-0.2.2.3.tar.gz sha256: 85c244c80d1c889a3d79073a6f5a99d9e769dbe3c574ca11d992b2b4f7599a5c diff --git a/tests/integration/tests/2195-depend-on-exe/files/stack.yaml b/tests/integration/tests/2195-depend-on-exe/files/stack.yaml index d3ca44cf59..155c0c3d69 100644 --- a/tests/integration/tests/2195-depend-on-exe/files/stack.yaml +++ b/tests/integration/tests/2195-depend-on-exe/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 8b61f53f4e..ea64f2c119 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.6.4 --compiler-bin):$PATH +export PATH=$(pwd)/fake-path:$("$STACK_EXE" path --resolver ghc-9.6.5 --compiler-bin):$PATH export STACK_ROOT=$(pwd)/fake-root which ghc -"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.6.4 ghc -- --info -"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.6.4 runghc foo.hs +"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.6.5 ghc -- --info +"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.6.5 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 88728049e7..9f7de14606 100644 --- a/tests/integration/tests/2781-shadow-bug/files/stack.yaml +++ b/tests/integration/tests/2781-shadow-bug/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 b7d3690d18..cf34aca02e 100644 --- a/tests/integration/tests/2997-ensure-warnings-output/files/stack.yaml +++ b/tests/integration/tests/2997-ensure-warnings-output/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 d3ca44cf59..155c0c3d69 100644 --- a/tests/integration/tests/32-unlisted-module/files/stack.yaml +++ b/tests/integration/tests/32-unlisted-module/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 d3ca44cf59..155c0c3d69 100644 --- a/tests/integration/tests/3315-multi-ghc-options/files/stack.yaml +++ b/tests/integration/tests/3315-multi-ghc-options/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 d3ca44cf59..155c0c3d69 100644 --- a/tests/integration/tests/335-multi-package-flags/files/stack.yaml +++ b/tests/integration/tests/335-multi-package-flags/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 diff --git a/tests/integration/tests/3390-unbuildable-test/files/stack.yaml b/tests/integration/tests/3390-unbuildable-test/files/stack.yaml index f89763014a..c59a4f74c3 100644 --- a/tests/integration/tests/3390-unbuildable-test/files/stack.yaml +++ b/tests/integration/tests/3390-unbuildable-test/files/stack.yaml @@ -1 +1 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 11b246cd91..121f71e436 100644 --- a/tests/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml +++ b/tests/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 name: custom1 packages: - acme-missiles-0.3 diff --git a/tests/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml b/tests/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml index be5bcfe272..37af3764b9 100644 --- a/tests/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml +++ b/tests/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 name: custom2 packages: - acme-missiles-0.2 diff --git a/tests/integration/tests/345-override-bytestring/files/stack.yaml b/tests/integration/tests/345-override-bytestring/files/stack.yaml index 9753b7321a..f233e73353 100644 --- a/tests/integration/tests/345-override-bytestring/files/stack.yaml +++ b/tests/integration/tests/345-override-bytestring/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 426199939a..e4cf40055c 100644 --- a/tests/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml +++ b/tests/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml @@ -1,4 +1,4 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 cadc7fb1e1..d3730b72c2 100644 --- a/tests/integration/tests/3574-extra-dep-local/files/stack.yaml +++ b/tests/integration/tests/3574-extra-dep-local/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 d3ca44cf59..155c0c3d69 100644 --- a/tests/integration/tests/3591-cabal-warnings-once/files/stack.yaml +++ b/tests/integration/tests/3591-cabal-warnings-once/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 diff --git a/tests/integration/tests/365-invalid-success/files/stack.yaml b/tests/integration/tests/365-invalid-success/files/stack.yaml index d3ca44cf59..155c0c3d69 100644 --- a/tests/integration/tests/365-invalid-success/files/stack.yaml +++ b/tests/integration/tests/365-invalid-success/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 d3ca44cf59..155c0c3d69 100644 --- a/tests/integration/tests/366-non-root-dir/files/stack.yaml +++ b/tests/integration/tests/366-non-root-dir/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 f89763014a..c59a4f74c3 100644 --- a/tests/integration/tests/370-invalid-setup-hs/files/stack.yaml +++ b/tests/integration/tests/370-invalid-setup-hs/files/stack.yaml @@ -1 +1 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 d3ca44cf59..155c0c3d69 100644 --- a/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml +++ b/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 0d28fbf0e7..c6040d554c 100644 --- a/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml +++ b/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 3ff0352d91..3b8c3c97ec 100644 --- a/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml +++ b/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 d3ca44cf59..155c0c3d69 100644 --- a/tests/integration/tests/3863-purge-command/files/stack.yaml +++ b/tests/integration/tests/3863-purge-command/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 57fce58d68..ba613023d3 100644 --- a/tests/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml +++ b/tests/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 6d89685472..1c38c67262 100644 --- a/tests/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml +++ b/tests/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 9101d8c27b..155063b7bc 100644 --- a/tests/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml +++ b/tests/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml @@ -1,3 +1,3 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 d3ca44cf59..155c0c3d69 100644 --- a/tests/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml +++ b/tests/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml @@ -1 +1 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 58a3aab728..530b37e2b6 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-22.7 +resolver: lts-22.21 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 d3ca44cf59..155c0c3d69 100644 --- a/tests/integration/tests/3959-order-of-flags/files/stack.yaml +++ b/tests/integration/tests/3959-order-of-flags/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 d3ca44cf59..155c0c3d69 100644 --- a/tests/integration/tests/397-case-insensitive-flags/files/stack.yaml +++ b/tests/integration/tests/397-case-insensitive-flags/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 57fce58d68..ba613023d3 100644 --- a/tests/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml +++ b/tests/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 d3ca44cf59..155c0c3d69 100644 --- a/tests/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml +++ b/tests/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 diff --git a/tests/integration/tests/4001-excess-recompilation/files/stack.yaml b/tests/integration/tests/4001-excess-recompilation/files/stack.yaml index f89763014a..c59a4f74c3 100644 --- a/tests/integration/tests/4001-excess-recompilation/files/stack.yaml +++ b/tests/integration/tests/4001-excess-recompilation/files/stack.yaml @@ -1 +1 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 35e7833c14..0062c38880 100644 --- a/tests/integration/tests/4044-no-run-tests-config/files/stack.yaml +++ b/tests/integration/tests/4044-no-run-tests-config/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 build: test-arguments: diff --git a/tests/integration/tests/4101-dependency-tree/Main.hs b/tests/integration/tests/4101-dependency-tree/Main.hs index 5d5e9b08ae..a2ec5798c4 100644 --- a/tests/integration/tests/4101-dependency-tree/Main.hs +++ b/tests/integration/tests/4101-dependency-tree/Main.hs @@ -8,7 +8,7 @@ main = unless isWindows $ do stackCheckStdout ["ls", "dependencies", "tree"] $ \stdOut -> do let expected = unlines [ "Packages" , "├─┬ files 0.1.0.0" - , "│ ├─┬ base 4.18.2.0" + , "│ ├─┬ base 4.18.2.1" ] unless (expected `isPrefixOf` stdOut) $ error $ unlines [ "Expected:", expected, "Actual:", stdOut ] @@ -16,12 +16,12 @@ main = unless isWindows $ do stackCheckStdout ["ls", "dependencies", "tree", "--depth=1"] $ \stdOut -> do let expected = unlines [ "Packages" , "├─┬ files 0.1.0.0" - , "│ ├── base 4.18.2.0" + , "│ ├── base 4.18.2.1" , "│ ├── filelock 0.1.1.2" , "│ ├── mtl 2.3.1" , "│ └── subproject 0.1.0.0" , "└─┬ subproject 0.1.0.0" - , " └── base 4.18.2.0" + , " └── base 4.18.2.1" ] when (stdOut /= expected) $ error $ unlines [ "Expected:", expected, "Actual:", stdOut ] @@ -29,7 +29,7 @@ main = unless isWindows $ do stackCheckStdout ["ls", "dependencies", "tree", "subproject"] $ \stdOut -> do let expected = unlines [ "Packages" , "└─┬ subproject 0.1.0.0" - , " └─┬ base 4.18.2.0" + , " └─┬ base 4.18.2.1" , " ├─┬ ghc-bignum 1.3" , " │ └─┬ ghc-prim 0.10.0" , " │ └── rts 1.0.2" diff --git a/tests/integration/tests/4101-dependency-tree/files/stack.yaml b/tests/integration/tests/4101-dependency-tree/files/stack.yaml index 1f9111c78b..24ec417287 100644 --- a/tests/integration/tests/4101-dependency-tree/files/stack.yaml +++ b/tests/integration/tests/4101-dependency-tree/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 d3ca44cf59..155c0c3d69 100644 --- a/tests/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml +++ b/tests/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 diff --git a/tests/integration/tests/4215-missing-unregister/files/stack1.yaml b/tests/integration/tests/4215-missing-unregister/files/stack1.yaml index 9fa93197db..c63556165e 100644 --- a/tests/integration/tests/4215-missing-unregister/files/stack1.yaml +++ b/tests/integration/tests/4215-missing-unregister/files/stack1.yaml @@ -1,3 +1,3 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 679be7c1f2..b8036c7a11 100644 --- a/tests/integration/tests/4215-missing-unregister/files/stack2.yaml +++ b/tests/integration/tests/4215-missing-unregister/files/stack2.yaml @@ -1,3 +1,3 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 d3ca44cf59..155c0c3d69 100644 --- a/tests/integration/tests/4270-files-order/files/stack.yaml +++ b/tests/integration/tests/4270-files-order/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 f89763014a..c59a4f74c3 100644 --- a/tests/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml +++ b/tests/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml @@ -1 +1 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 f89763014a..c59a4f74c3 100644 --- a/tests/integration/tests/4390-dot-no-ghc/files/stack.yaml +++ b/tests/integration/tests/4390-dot-no-ghc/files/stack.yaml @@ -1 +1 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 diff --git a/tests/integration/tests/4453-detailed/files/stack.yaml b/tests/integration/tests/4453-detailed/files/stack.yaml index d3ca44cf59..155c0c3d69 100644 --- a/tests/integration/tests/4453-detailed/files/stack.yaml +++ b/tests/integration/tests/4453-detailed/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 f89763014a..c59a4f74c3 100644 --- a/tests/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml +++ b/tests/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml @@ -1 +1 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 7ba0afd034..9ebf57e83a 100644 --- a/tests/integration/tests/4488-newer-cabal-version/files/stack-good.yaml +++ b/tests/integration/tests/4488-newer-cabal-version/files/stack-good.yaml @@ -1,3 +1,3 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 f89763014a..c59a4f74c3 100644 --- a/tests/integration/tests/4754-rebuild-haddocks/files/stack.yaml +++ b/tests/integration/tests/4754-rebuild-haddocks/files/stack.yaml @@ -1 +1 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 diff --git a/tests/integration/tests/4783-doctest-deps/files/snapshot.yaml b/tests/integration/tests/4783-doctest-deps/files/snapshot.yaml index c59955d8a6..fdcd48a5f5 100644 --- a/tests/integration/tests/4783-doctest-deps/files/snapshot.yaml +++ b/tests/integration/tests/4783-doctest-deps/files/snapshot.yaml @@ -1,4 +1,4 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 4d0833fbc3..b6a162e9cb 100644 --- a/tests/integration/tests/4897-boot-package-pruned/files/stack.yaml +++ b/tests/integration/tests/4897-boot-package-pruned/files/stack.yaml @@ -1,3 +1,3 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 d3ca44cf59..155c0c3d69 100644 --- a/tests/integration/tests/4938-non-ascii-module-names/files/stack.yaml +++ b/tests/integration/tests/4938-non-ascii-module-names/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 18d230344f..b8431c21f2 100644 --- a/tests/integration/tests/5180-ghc-rts-flags/files/stack.yaml +++ b/tests/integration/tests/5180-ghc-rts-flags/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 ghc-options: "$locals": -j8 +RTS -s -A128M diff --git a/tests/integration/tests/5272-only-locals/files/stack.yaml b/tests/integration/tests/5272-only-locals/files/stack.yaml index fdab14ce55..9b2c5790d0 100644 --- a/tests/integration/tests/5272-only-locals/files/stack.yaml +++ b/tests/integration/tests/5272-only-locals/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 e26fffe2fb..666af3a189 100644 --- a/tests/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml +++ b/tests/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml @@ -1,4 +1,4 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 e26fffe2fb..666af3a189 100644 --- a/tests/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml +++ b/tests/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml @@ -1,4 +1,4 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 d3ca44cf59..155c0c3d69 100644 --- a/tests/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml +++ b/tests/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml @@ -1 +1 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 d3ca44cf59..155c0c3d69 100644 --- a/tests/integration/tests/6046-missing-sublib-unregister/files/stack.yaml +++ b/tests/integration/tests/6046-missing-sublib-unregister/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 d3ca44cf59..155c0c3d69 100644 --- a/tests/integration/tests/606-local-version-not-exist/files/stack.yaml +++ b/tests/integration/tests/606-local-version-not-exist/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 ef2066521a..6700d2f74d 100644 --- a/tests/integration/tests/617-extra-dep-flag/files/stack.yaml +++ b/tests/integration/tests/617-extra-dep-flag/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 f89763014a..c59a4f74c3 100644 --- a/tests/integration/tests/617-unused-flag-cli/files/stack.yaml +++ b/tests/integration/tests/617-unused-flag-cli/files/stack.yaml @@ -1 +1 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 fbbb6a69b3..d923bfdb77 100644 --- a/tests/integration/tests/617-unused-flag-name-yaml/files/stack.yaml +++ b/tests/integration/tests/617-unused-flag-name-yaml/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 76c098a5dd..e23b1c64de 100644 --- a/tests/integration/tests/617-unused-flag-yaml/files/stack.yaml +++ b/tests/integration/tests/617-unused-flag-yaml/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 f5c1d16848..7cb546145a 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-22.7 async -eval `stack config env --resolver lts-22.7` +stack build --resolver lts-22.21 async +eval `stack config env --resolver lts-22.21` ghc Main.hs diff --git a/tests/integration/tests/6372-sdist-unicode-test/files/stack.yaml b/tests/integration/tests/6372-sdist-unicode-test/files/stack.yaml index d3ca44cf59..155c0c3d69 100644 --- a/tests/integration/tests/6372-sdist-unicode-test/files/stack.yaml +++ b/tests/integration/tests/6372-sdist-unicode-test/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 diff --git a/tests/integration/tests/6465-msys-environment/files/stack.yaml b/tests/integration/tests/6465-msys-environment/files/stack.yaml index 1ce8f6529c..f3a2037b56 100644 --- a/tests/integration/tests/6465-msys-environment/files/stack.yaml +++ b/tests/integration/tests/6465-msys-environment/files/stack.yaml @@ -1,2 +1,2 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 msys-environment: UCRT64 diff --git a/tests/integration/tests/717-sdist-test/files/stack.yaml b/tests/integration/tests/717-sdist-test/files/stack.yaml index 58579cedef..04198b94af 100644 --- a/tests/integration/tests/717-sdist-test/files/stack.yaml +++ b/tests/integration/tests/717-sdist-test/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 d3ca44cf59..155c0c3d69 100644 --- a/tests/integration/tests/763-buildable-false/files/stack.yaml +++ b/tests/integration/tests/763-buildable-false/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 diff --git a/tests/integration/tests/796-ghc-options/files/stack.yaml b/tests/integration/tests/796-ghc-options/files/stack.yaml index cc1c58fb81..e1532f1582 100644 --- a/tests/integration/tests/796-ghc-options/files/stack.yaml +++ b/tests/integration/tests/796-ghc-options/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 f3d6ce35ce..380c511738 100644 --- a/tests/integration/tests/allow-newer-specific-packages/files/stack.yaml +++ b/tests/integration/tests/allow-newer-specific-packages/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 c1a7149085..5a04976536 100644 --- a/tests/integration/tests/cabal-non-buildable-bug/Main.hs +++ b/tests/integration/tests/cabal-non-buildable-bug/Main.hs @@ -4,7 +4,7 @@ main :: IO () main = do -- Newer Cabal: dry run and building should succeed, because they'll -- both ignore the do-not-build - writeFile "stack.yaml" "snapshot: lts-22.7" + writeFile "stack.yaml" "snapshot: lts-22.21" 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 d6c44c1f83..cb99bf195c 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.6.4.) +-- (See stack.yaml; using GHC 9.6.5.) 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 748a110605..0d44ef065e 100644 --- a/tests/integration/tests/cabal-sublibrary-dependency/files/stack.yaml +++ b/tests/integration/tests/cabal-sublibrary-dependency/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: lts-22.7 # GHC 9.6.4 +snapshot: lts-22.21 # GHC 9.6.5 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 7023d3c7c2..fae1b3f626 100644 --- a/tests/integration/tests/copy-bins-works/files/stack.yaml +++ b/tests/integration/tests/copy-bins-works/files/stack.yaml @@ -1,2 +1,2 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 copy-bins: true diff --git a/tests/integration/tests/drop-packages/files/stack.yaml b/tests/integration/tests/drop-packages/files/stack.yaml index 741b1d9c44..742abefb93 100644 --- a/tests/integration/tests/drop-packages/files/stack.yaml +++ b/tests/integration/tests/drop-packages/files/stack.yaml @@ -1,3 +1,3 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 5d0f3c15db..8c007d7d80 100644 --- a/tests/integration/tests/duplicate-package-ids/files/stack1.yaml +++ b/tests/integration/tests/duplicate-package-ids/files/stack1.yaml @@ -1,2 +1,2 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 packages: [] diff --git a/tests/integration/tests/duplicate-package-ids/files/stack2.yaml b/tests/integration/tests/duplicate-package-ids/files/stack2.yaml index 073d9de21a..becbb5a1f2 100644 --- a/tests/integration/tests/duplicate-package-ids/files/stack2.yaml +++ b/tests/integration/tests/duplicate-package-ids/files/stack2.yaml @@ -1,3 +1,3 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 029275887f..69a96614e2 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.6.4 --compiler-bin) +stack_bin=$("$STACK_EXE" path --resolver ghc-9.6.5 --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.6.4 ghc -- --info -"$STACK_EXE" --no-install-ghc --resolver ghc-9.6.4 runghc foo.hs +"$STACK_EXE" --no-install-ghc --resolver ghc-9.6.5 ghc -- --info +"$STACK_EXE" --no-install-ghc --resolver ghc-9.6.5 runghc foo.hs diff --git a/tests/integration/tests/haddock-options/files/stack.yaml b/tests/integration/tests/haddock-options/files/stack.yaml index dddadd8783..764c9abf64 100644 --- a/tests/integration/tests/haddock-options/files/stack.yaml +++ b/tests/integration/tests/haddock-options/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 build: haddock-arguments: diff --git a/tests/integration/tests/hpack-repo/files/stack.yaml b/tests/integration/tests/hpack-repo/files/stack.yaml index 037d42dec5..2d17fc12c7 100644 --- a/tests/integration/tests/hpack-repo/files/stack.yaml +++ b/tests/integration/tests/hpack-repo/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 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 224f7825fd..7d269e2ecc 100644 --- a/tests/integration/tests/init-omit-packages/Main.hs +++ b/tests/integration/tests/init-omit-packages/Main.hs @@ -5,8 +5,8 @@ import System.IO (readFile) main :: IO () main = do removeFileIgnore "stack.yaml" - stackErr ["init", "--snapshot", "lts-22.7"] - stack ["init", "--snapshot", "lts-22.7", "--omit-packages"] + stackErr ["init", "--snapshot", "lts-22.21"] + stack ["init", "--snapshot", "lts-22.21", "--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/Main.hs b/tests/integration/tests/internal-libraries/Main.hs index e61b083aa4..a20d9ea30f 100644 --- a/tests/integration/tests/internal-libraries/Main.hs +++ b/tests/integration/tests/internal-libraries/Main.hs @@ -1,4 +1,20 @@ import StackTest +import Control.Monad ( unless ) +-- This does not work on Windows with snapshot: ghc-9.6.5 (Cabal-3.10.3.0). It +-- fails witb: +-- +-- Preprocessing foreign library 'baz' for files-0.1.0.0.. +-- Building foreign library 'baz' for files-0.1.0.0.. +-- [1 of 1] Compiling Baz +-- [1 of 2] Compiling Baz [Flags changed] +-- [2 of 2] Linking .stack-work\dist\eebe39f7\build\baz\baz.dll +-- lld: error: unknown argument: -rpath +-- lld: error: unknown argument: -rpath +-- clang: error: linker command failed with exit code 1 (use -v to see invocation) +-- ghc-9.6.5.exe: `clang.exe' failed in phase `Linker'. (Exit code: 1) +-- +-- The above is a regression from snapshot: ghc-9.6.4 (Cabal-3.10.1.0). See +-- https://github.com/haskell/cabal/issues/9982. main :: IO () -main = stack ["build"] +main = unless isWindows $ stack ["build"] diff --git a/tests/integration/tests/internal-libraries/files/stack.yaml b/tests/integration/tests/internal-libraries/files/stack.yaml index d34715d611..c59a4f74c3 100644 --- a/tests/integration/tests/internal-libraries/files/stack.yaml +++ b/tests/integration/tests/internal-libraries/files/stack.yaml @@ -1,20 +1 @@ -# This does not work on Windows with snapshot: ghc-9.0.2. It fails with: -# -# Building foreign library 'baz' for files-0.1.0.0.. -# [1 of 1] Compiling Baz [flags changed] -# [1 of 1] Compiling Baz [flags changed] -# Linking .stack-work\dist\d53b6a14\build\baz\baz.dll ... -# //ghc-9.0.2//mingw//bin/ld.exe: cannot find -lHSrts -# collect2.exe: error: ld returned 1 exit status -# `gcc.exe' failed in phase `Linker'. (Exit code: 1) -# -# See https://github.com/haskell/cabal/issues/7763, which includes "Cabal is -# currently unable to build foreign libraries with GHC 9.0 or 9.2." 'Currently' -# refers to Cabal versions before 3.8. -# -# Also see https://github.com/haskell/cabal/issues/7763. On macOS (Apple -# silicon), fails with snapshot: ghc-8.10.7 with Cabal error: -# "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" -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 diff --git a/tests/integration/tests/lock-files/files/stack-1-extra b/tests/integration/tests/lock-files/files/stack-1-extra index 521a3506a0..4d7a0ddfb8 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-22.7 +resolver: lts-22.21 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 95f848dfde..79c42f02d0 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-22.7 +resolver: lts-22.21 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 d3ca44cf59..155c0c3d69 100644 --- a/tests/integration/tests/module-added-multiple-times/files/stack.yaml +++ b/tests/integration/tests/module-added-multiple-times/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 diff --git a/tests/integration/tests/multi-test/files/stack.yaml b/tests/integration/tests/multi-test/files/stack.yaml index b6a42af8e4..1fd18c9a34 100644 --- a/tests/integration/tests/multi-test/files/stack.yaml +++ b/tests/integration/tests/multi-test/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 packages: - . - sub-package diff --git a/tests/integration/tests/mutable-deps/files/stack.yaml b/tests/integration/tests/mutable-deps/files/stack.yaml index 407e03cd4c..0bdecb832d 100644 --- a/tests/integration/tests/mutable-deps/files/stack.yaml +++ b/tests/integration/tests/mutable-deps/files/stack.yaml @@ -1,4 +1,4 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 extra-deps: - ./filepath-1.4.100.4 # Required, otherwise Stack reports that GHC boot library has been pruned. diff --git a/tests/integration/tests/nice-resolver-names/Main.hs b/tests/integration/tests/nice-resolver-names/Main.hs index acea8d11b6..9c42e0cf6a 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-22.7"] $ \snapshot -> do + for_ ["lts-20.26", "lts-22.21"] $ \snapshot -> do stack ["init", "--force", "--snapshot", snapshot] str <- readFile "stack.yaml" case mapMaybe (stripPrefix "snapshot: ") $ lines str of diff --git a/tests/integration/tests/no-rerun-tests/files/stack.yaml b/tests/integration/tests/no-rerun-tests/files/stack.yaml index f89763014a..c59a4f74c3 100644 --- a/tests/integration/tests/no-rerun-tests/files/stack.yaml +++ b/tests/integration/tests/no-rerun-tests/files/stack.yaml @@ -1 +1 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 diff --git a/tests/integration/tests/override-compiler/Main.hs b/tests/integration/tests/override-compiler/Main.hs index 6d9d43c472..31cfefa431 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.6.4") $ error $ "Invalid version: " ++ show ver + unless (concat (lines ver) == "9.6.5") $ 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 60961e4ffb..7b1ca9ba35 100644 --- a/tests/integration/tests/override-compiler/files/stack.yaml +++ b/tests/integration/tests/override-compiler/files/stack.yaml @@ -1,3 +1,3 @@ -snapshot: lts-22.6 -compiler: ghc-9.6.4 +snapshot: lts-22.20 +compiler: ghc-9.6.5 packages: [] diff --git a/tests/integration/tests/proper-rebuilds/files/stack.yaml b/tests/integration/tests/proper-rebuilds/files/stack.yaml index f89763014a..c59a4f74c3 100644 --- a/tests/integration/tests/proper-rebuilds/files/stack.yaml +++ b/tests/integration/tests/proper-rebuilds/files/stack.yaml @@ -1 +1 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 95eb428062..45d6b8b55d 100644 --- a/tests/integration/tests/relative-script-snapshots/files/subdir/snapshot.yaml +++ b/tests/integration/tests/relative-script-snapshots/files/subdir/snapshot.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 ecdfe770a7..ad6d0a2515 100644 --- a/tests/integration/tests/script-extra-dep/files/script.hs +++ b/tests/integration/tests/script-extra-dep/files/script.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack --- stack --snapshot ghc-9.6.4 script --extra-dep acme-missiles-0.3@rev:0 --extra-dep stm-2.5.2.1@rev:0 +-- stack --snapshot ghc-9.6.5 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 0e0924e282..50d59390e6 100644 --- a/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-extra-dep.yaml +++ b/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-extra-dep.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 88b715691c..bd8700a697 100644 --- a/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/snapshot.yaml +++ b/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/snapshot.yaml @@ -1,4 +1,4 @@ -snapshot: ghc-9.6.4 +snapshot: ghc-9.6.5 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 8fda952d8f..09284a31c4 100644 --- a/tests/integration/tests/upload/files/stack.yaml +++ b/tests/integration/tests/upload/files/stack.yaml @@ -1,2 +1,2 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 hackage-base-url: http://localhost:12415/ diff --git a/tests/integration/tests/watched-files/files/stack.yaml b/tests/integration/tests/watched-files/files/stack.yaml index d3ca44cf59..155c0c3d69 100644 --- a/tests/integration/tests/watched-files/files/stack.yaml +++ b/tests/integration/tests/watched-files/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-22.7 +snapshot: lts-22.21 diff --git a/tests/unit/Stack/ConfigSpec.hs b/tests/unit/Stack/ConfigSpec.hs index 5d41f061a1..6b455b0860 100644 --- a/tests/unit/Stack/ConfigSpec.hs +++ b/tests/unit/Stack/ConfigSpec.hs @@ -53,12 +53,12 @@ import Test.Hspec sampleConfig :: String sampleConfig = - "snapshot: lts-22.7\n" ++ + "snapshot: lts-22.21\n" ++ "packages: ['.']\n" buildOptsConfig :: String buildOptsConfig = - "snapshot: lts-22.7\n" ++ + "snapshot: lts-22.21\n" ++ "packages: ['.']\n" ++ "build:\n" ++ " library-profiling: true\n" ++ @@ -104,7 +104,7 @@ buildOptsConfig = buildOptsHaddockForHackageConfig :: String buildOptsHaddockForHackageConfig = - "snapshot: lts-22.7\n" ++ + "snapshot: lts-22.21\n" ++ "packages: ['.']\n" ++ "build:\n" ++ " haddock: true\n" ++ @@ -120,24 +120,24 @@ buildOptsHaddockForHackageConfig = hpackConfig :: String hpackConfig = - "snapshot: lts-22.7\n" ++ + "snapshot: lts-22.21\n" ++ "with-hpack: /usr/local/bin/hpack\n" ++ "packages: ['.']\n" resolverConfig :: String resolverConfig = - "resolver: lts-22.7\n" ++ + "resolver: lts-22.21\n" ++ "packages: ['.']\n" snapshotConfig :: String snapshotConfig = - "snapshot: lts-22.7\n" ++ + "snapshot: lts-22.21\n" ++ "packages: ['.']\n" resolverSnapshotConfig :: String resolverSnapshotConfig = - "resolver: lts-22.7\n" ++ - "snapshot: lts-22.7\n" ++ + "resolver: lts-22.21\n" ++ + "snapshot: lts-22.21\n" ++ "packages: ['.']\n" stackDotYaml :: Path Rel File @@ -187,11 +187,11 @@ spec = beforeAll setup $ do it "parses snapshot using 'resolver'" $ inTempDir $ do loadProject resolverConfig $ \project -> - project.snapshot `shouldBe` RSLSynonym (LTS 22 7) + project.snapshot `shouldBe` RSLSynonym (LTS 22 21) it "parses snapshot using 'snapshot'" $ inTempDir $ do loadProject snapshotConfig $ \project -> - project.snapshot `shouldBe` RSLSynonym (LTS 22 7) + project.snapshot `shouldBe` RSLSynonym (LTS 22 21) it "throws if both 'resolver' and 'snapshot' are present" $ inTempDir $ do loadProject resolverSnapshotConfig (const (pure ())) @@ -315,7 +315,7 @@ spec = beforeAll setup $ do packageYaml = childRel either impureThrow id (parseRelFile "package.yaml") createDirectoryIfMissing True $ toFilePath $ parent yamlAbs - writeFile (toFilePath yamlAbs) "snapshot: ghc-9.6.4" + writeFile (toFilePath yamlAbs) "snapshot: ghc-9.6.5" writeFile (toFilePath packageYaml) "name: foo" withEnvVar "STACK_YAML" (toFilePath yamlRel) $ loadConfig' $ \config -> liftIO $ do