From d23fdefd32f1d8c727ded1fca1385feded4a0176 Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Sat, 7 Dec 2024 16:27:08 +0000 Subject: [PATCH] Bump stack.yaml to lts-22.43 --- CONTRIBUTING.md | 8 +++---- cabal.project | 2 +- doc/commands/list_command.md | 6 ++--- doc/commands/script_command.md | 8 +++---- doc/configure/yaml/non-project.md | 2 +- doc/topics/Stack_and_VS_Code.md | 2 +- doc/topics/custom_snapshot.md | 22 +++++++++---------- doc/topics/haskell_and_c_code.md | 4 ++-- doc/topics/scripts.md | 22 +++++++++---------- .../stack_yaml_vs_cabal_package_file.md | 6 ++--- etc/scripts/build-stack-installer.hs | 2 +- etc/scripts/release-linux-aarch64.hs | 4 ++-- etc/scripts/release.hs | 4 ++-- src/Stack/Init.hs | 4 ++-- stack.yaml | 16 +++++--------- stack.yaml.lock | 22 ++++--------------- tests/integration/lib/StackTest.hs | 2 +- .../files/snapshot-modify-lts.yaml | 2 +- .../files/snapshots/local-snapshot.yaml | 2 +- .../files/snapshots/remote-snapshot.yaml | 2 +- .../1337-unicode-everywhere/files/stack.yaml | 2 +- .../1659-skip-component/files/stack.yaml | 2 +- .../1884-url-to-tarball/files/stack.yaml | 2 +- .../tests/2195-depend-on-exe/files/stack.yaml | 2 +- .../tests/32-unlisted-module/files/stack.yaml | 2 +- .../3315-multi-ghc-options/files/stack.yaml | 2 +- .../335-multi-package-flags/files/stack.yaml | 2 +- .../345-override-bytestring/files/stack.yaml | 2 +- .../files/orig-stack.yaml | 2 +- .../3591-cabal-warnings-once/files/stack.yaml | 2 +- .../365-invalid-success/files/stack.yaml | 2 +- .../tests/366-non-root-dir/files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../tests/3863-purge-command/files/stack.yaml | 2 +- .../files/no-base-upgrade.yaml | 2 +- .../files/unattainable-base.yaml | 2 +- .../files/test-stack.yml | 2 +- .../3959-order-of-flags/files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../4101-dependency-tree/files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../tests/4270-files-order/files/stack.yaml | 2 +- .../tests/4453-detailed/files/stack.yaml | 2 +- .../4783-doctest-deps/files/snapshot.yaml | 2 +- .../4897-boot-package-pruned/files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../tests/5180-ghc-rts-flags/files/stack.yaml | 2 +- .../files/package-a/stack.yaml | 2 +- .../files/package-b/stack.yaml | 2 +- .../files/package-c/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../tests/620-env-command/files/run.sh | 4 ++-- .../6372-sdist-unicode-test/files/stack.yaml | 2 +- .../6465-msys-environment/files/stack.yaml | 2 +- .../tests/717-sdist-test/files/stack.yaml | 2 +- .../763-buildable-false/files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../tests/cabal-non-buildable-bug/Main.hs | 2 +- .../files/stack.yaml | 2 +- .../tests/drop-packages/files/stack.yaml | 2 +- .../duplicate-package-ids/files/stack1.yaml | 2 +- .../duplicate-package-ids/files/stack2.yaml | 2 +- .../tests/haddock-options/files/stack.yaml | 2 +- .../tests/hpack-repo/files/stack.yaml | 2 +- .../tests/init-omit-packages/Main.hs | 4 ++-- .../tests/lock-files/files/stack-1-extra | 2 +- .../tests/lock-files/files/stack-2-extras | 2 +- .../files/stack.yaml | 2 +- .../tests/multi-test/files/stack.yaml | 2 +- .../tests/mutable-deps/files/stack.yaml | 2 +- .../tests/nice-resolver-names/Main.hs | 2 +- .../integration/tests/upload/files/stack.yaml | 2 +- .../tests/watched-files/files/stack.yaml | 2 +- tests/unit/Stack/ConfigSpec.hs | 20 ++++++++--------- 76 files changed, 129 insertions(+), 147 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9081c46e1d..7b70da6ffb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -348,10 +348,10 @@ compatibility with a range of versions of GHC that a library package (such as Stack aims to depend on well-known packages. The specific versions on which it depends at any time are specified by `package.yaml` and `stack.yaml`. It does not aim to be compatible with more than one version of the `Cabal` package at -any time. At the time of writing (september 2024) the package versions are -primarily ones in Stackage snapshot LTS Haskell 22.28 (for GHC 9.6.6), together -with extra-deps to depend on the latest version of `hpack`, `pantry`, `tar`, -`tls` and `crypton-connection`. +any time. At the time of writing (December 2024) the package versions are +primarily ones in Stackage snapshot LTS Haskell 22.43 (for GHC 9.6.6), together +with extra-deps to depend on the latest versions of `crypton-connection`, +`hpack`, `pantry`, `tar` and `tls`. A Stack executable makes use of Cabal (the library) through a small 'Setup' executable that it compiles from Haskell source code. The executable compiles diff --git a/cabal.project b/cabal.project index 82a944444a..dad14b91d5 100644 --- a/cabal.project +++ b/cabal.project @@ -33,7 +33,7 @@ -- 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.28/cabal.config. +-- https://www.stackage.org/lts-22.43/cabal.config. -- with-compiler: ghc-9.6.6 import: cabal.config diff --git a/doc/commands/list_command.md b/doc/commands/list_command.md index e882a0b688..72c5defa3f 100644 --- a/doc/commands/list_command.md +++ b/doc/commands/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.28 list base unix Win32 acme-missiles pantry +stack --snapshot lts-22.43 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.28 list base unix Win32 pantry +stack --snapshot lts-22.43 list base unix Win32 pantry base-4.18.2.1 unix-2.8.4.0 Win32-2.13.3.0 pantry-0.9.3.2 -stack --snapshot lts-22.28 list +stack --snapshot lts-22.43 list AC-Angle-1.0 ALUT-2.4.0.3 ... diff --git a/doc/commands/script_command.md b/doc/commands/script_command.md index 91913d0455..aeda632821 100644 --- a/doc/commands/script_command.md +++ b/doc/commands/script_command.md @@ -49,7 +49,7 @@ A snapshot must be specified on the command line, using the `--snapshot` option. For example: ~~~text -stack script --snapshot lts-22.28 MyScript.hs +stack script --snapshot lts-22.43 MyScript.hs ~~~ A package version can be added to the snapshot on the command line with the @@ -187,7 +187,7 @@ main = do can be compiled and run, with arguments, with: ~~~text -stack --snapshot lts-22.28 script --package acme-missiles --compile MyScript.hs -- "Don't panic!" "Duck and cover!" +stack --snapshot lts-22.43 script --package acme-missiles --compile MyScript.hs -- "Don't panic!" "Duck and cover!" ~~~ `acme-missiles-0.3` (the most recent version in the package index) will be used. @@ -207,7 +207,7 @@ snapshot as an extra-dep. The `stack script` command is specified using Stack's ~~~haskell {- stack script - -- snapshot lts-22.28 + -- snapshot lts-22.43 -- extra-dep acme-missiles-0.2 -- package acme-missiles -} @@ -309,7 +309,7 @@ A Haskell source file `MyScript.hs`, as follows: ~~~haskell {- stack script - --snapshot lts-22.28 + --snapshot lts-22.43 -} {-# LANGUAGE OverloadedStrings #-} diff --git a/doc/configure/yaml/non-project.md b/doc/configure/yaml/non-project.md index a4afb8fe63..be624b86c7 100644 --- a/doc/configure/yaml/non-project.md +++ b/doc/configure/yaml/non-project.md @@ -294,7 +294,7 @@ snapshots like `ghc-9.6.6`. This can be used to override the compiler for a Stackage snapshot, like this: ~~~yaml -snapshot: lts-22.28 +snapshot: lts-22.43 compiler: ghc-9.6.5 compiler-check: match-exact ~~~ diff --git a/doc/topics/Stack_and_VS_Code.md b/doc/topics/Stack_and_VS_Code.md index 87ad9b57f2..634a44ad25 100644 --- a/doc/topics/Stack_and_VS_Code.md +++ b/doc/topics/Stack_and_VS_Code.md @@ -150,7 +150,7 @@ VS Code with the 'Haskell' extension can be configured in a number of ways: Each time that a snapshot is used that references a different version of GHC, then GHCup must be used to install it (if GHCup has not already - installed that version). For example, to use `snapshot: lts-22.28` + installed that version). For example, to use `snapshot: lts-22.43` (GHC 9.6.6), the command `ghcup install ghc 9.6.6` must have been used to install GHC 9.6.6. That may be a minor inconvenience for some people, as one the primary benefits of Stack over other tools for building diff --git a/doc/topics/custom_snapshot.md b/doc/topics/custom_snapshot.md index 96ef541bdf..c1a19cdb7e 100644 --- a/doc/topics/custom_snapshot.md +++ b/doc/topics/custom_snapshot.md @@ -18,7 +18,7 @@ available in snapshots to ensure reproducibility. for snapshot specification. ~~~yaml -snapshot: lts-22.28 # Inherits GHC version and package set +snapshot: lts-22.43 # Inherits GHC version and package set compiler: ghc-9.6.5 # Overwrites GHC version in the snapshot, optional # Additional packages, follows extra-deps syntax @@ -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.28`, but +The following snapshot specification will be identical to `lts-22.43`, but instead use `ghc-9.6.5` instead of `ghc-9.6.6`: ~~~yaml -snapshot: lts-22.28 +snapshot: lts-22.43 compiler: ghc-9.6.5 ~~~ ### Dropping packages -The following snapshot specification will be identical to `lts-22.28`, but +The following snapshot specification will be identical to `lts-22.43`, 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.28 +snapshot: lts-22.43 drop-packages: - text ~~~ ### Hiding packages -The following snapshot specification will be identical to `lts-22.28`, but the +The following snapshot specification will be identical to `lts-22.43`, 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.28 +snapshot: lts-22.43 hidden: - text ~~~ @@ -101,11 +101,11 @@ In order to specify GHC options for a package, you use the same syntax as the [ghc-options](../configure/yaml/non-project.md#ghc-options) key for build configuration. -The following snapshot specification will be identical to `lts-22.28`, but +The following snapshot specification will be identical to `lts-22.43`, but provides `-O1` as a ghc-option for `text`: ~~~yaml -snapshot: lts-22.28 +snapshot: lts-22.43 packages: - text-2.0.2 ghc-options: @@ -124,11 +124,11 @@ packages in the `packages` list, rather than all packages in the snapshot. In order to specify Cabal flags for a package, you use the same syntax as the [flags](../configure/yaml/project.md#flags) key for build configuration. The -following snapshot specification will be identical to `lts-22.28`, but +following snapshot specification will be identical to `lts-22.43`, but it enables the `developer` Cabal flag: ~~~yaml -snapshot: lts-22.28 +snapshot: lts-22.43 packages: - text-2.0.2 flags: diff --git a/doc/topics/haskell_and_c_code.md b/doc/topics/haskell_and_c_code.md index 8006e2c66d..1013d1e5be 100644 --- a/doc/topics/haskell_and_c_code.md +++ b/doc/topics/haskell_and_c_code.md @@ -83,7 +83,7 @@ executables: The project's `stack.yaml` file only needs to identify a snapshot: ~~~yaml -snapshot: lts-22.28 # GHC 9.6.6 +snapshot: lts-22.43 # GHC 9.6.6 ~~~ This example project can be built with Stack in the normal way (`stack build`), @@ -220,7 +220,7 @@ The `include-dirs` key will cause the specified directory (again, The project's `stack.yaml` file only needs to identify a snapshot: ~~~yaml -snapshot: lts-22.28 # GHC 9.6.6 +snapshot: lts-22.43 # GHC 9.6.6 ~~~ This example project can be built with Stack in the normal way (`stack build`), diff --git a/doc/topics/scripts.md b/doc/topics/scripts.md index 019efc9b8f..dabf4eba5a 100644 --- a/doc/topics/scripts.md +++ b/doc/topics/scripts.md @@ -19,7 +19,7 @@ An example will be easiest to understand. Consider the Haskell source file ~~~haskell #!/usr/bin/env stack --- stack script --snapshot lts-22.28 --package turtle +-- stack script --snapshot lts-22.43 --package turtle {-# LANGUAGE OverloadedStrings #-} import Turtle (echo) main = echo "Hello World!" @@ -78,11 +78,11 @@ able to reuse everything already built). The second line of the source code is the Stack interpreter options comment. In this example, it specifies the [`stack script`](../commands/script_command.md) -command with the options of a LTS Haskell 22.28 snapshot -(`--snapshot lts-22.28`) and ensuring the +command with the options of a LTS Haskell 22.43 snapshot +(`--snapshot lts-22.43`) and ensuring the [`turtle`](https://hackage.haskell.org/package/turtle) package is available (`--package turtle`). The version of the package will be that in the specified -snapshot (`lts-22.28` provides `turtle-1.6.2`). +snapshot (`lts-22.43` provides `turtle-1.6.2`). ## Arguments and interpreter options and arguments @@ -117,7 +117,7 @@ For example, the command `stack MyScript.hs arg1 arg2` with `MyScript.hs`: ~~~haskell #!/usr/bin/env stack {- stack script - --snapshot lts-22.28 + --snapshot lts-22.43 -- +RTS -s -RTS -} @@ -133,7 +133,7 @@ main = do is equivalent to the following command at the command line: ~~~text -stack script --snapshot lts-22.28 -- MyScript.hs arg1 arg2 +RTS -s -RTS +stack script --snapshot lts-22.43 -- MyScript.hs arg1 arg2 +RTS -s -RTS ~~~ where `+RTS -s -RTS` are some of GHC's @@ -162,7 +162,7 @@ options, or by providing a comma or space separated list. For example: ~~~haskell #!/usr/bin/env stack {- stack script - --snapshot lts-22.28 + --snapshot lts-22.43 --package turtle --package "stm async" --package http-client,http-conduit @@ -207,7 +207,7 @@ which makes use of the joke package ~~~haskell {- stack script - --snapshot lts-22.28 + --snapshot lts-22.43 --package acme-missiles -} import Acme.Missiles (launchMissiles) @@ -218,7 +218,7 @@ main = launchMissiles The command `stack --script-no-run-compile Script.hs` then behaves as if the command -`stack script --snapshot lts-22.28 --package acme-missiles --no-run --compile -- Script.hs` +`stack script --snapshot lts-22.43 --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! @@ -260,7 +260,7 @@ those curious, here is an example with {- stack runghc --install-ghc - --snapshot lts-22.28 + --snapshot lts-22.43 --package base --package turtle -- @@ -284,7 +284,7 @@ it. Here is an example: {- stack exec ghci --install-ghc - --snapshot lts-22.28 + --snapshot lts-22.43 --package turtle -} ~~~ diff --git a/doc/topics/stack_yaml_vs_cabal_package_file.md b/doc/topics/stack_yaml_vs_cabal_package_file.md index f30a73dfe2..a630ab468d 100644 --- a/doc/topics/stack_yaml_vs_cabal_package_file.md +++ b/doc/topics/stack_yaml_vs_cabal_package_file.md @@ -64,9 +64,9 @@ requires that you have chosen a specific version for each package available. The most common means by which this set of packages is defined is via a snapshot provided by Stackage. For example, if you go to the page -, you will see a list of 3,373 packages at -specific version numbers. When you then specify `snapshot: lts-22.28` or, -alternatively, `resolver: lts-22.28`, you're telling Stack to use those package +, you will see a list of 3,378 packages at +specific version numbers. When you then specify `snapshot: lts-22.43` or, +alternatively, `resolver: lts-22.43`, 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/etc/scripts/build-stack-installer.hs b/etc/scripts/build-stack-installer.hs index 9f5d92a1a6..b4979281f4 100644 --- a/etc/scripts/build-stack-installer.hs +++ b/etc/scripts/build-stack-installer.hs @@ -1,5 +1,5 @@ {- stack script - --resolver lts-22.28 + --resolver lts-22.43 --install-ghc --package nsis -} diff --git a/etc/scripts/release-linux-aarch64.hs b/etc/scripts/release-linux-aarch64.hs index da20531209..d3c737f1cf 100644 --- a/etc/scripts/release-linux-aarch64.hs +++ b/etc/scripts/release-linux-aarch64.hs @@ -1,5 +1,5 @@ {- stack script - --resolver lts-22.28 + --resolver lts-22.43 --ghc-options -Wall -} @@ -7,7 +7,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. Stackage LTS Haskell 22.28 does not include boot packages +-- the snapshot. Stackage LTS Haskell 22.43 does not include boot packages -- directly. As GHC 9.6.6 boot packages Cabal and Cabal-syntax expose modules -- with the same names, the language extension PackageImports is required. diff --git a/etc/scripts/release.hs b/etc/scripts/release.hs index 0eb32b15e8..ead3f02e51 100644 --- a/etc/scripts/release.hs +++ b/etc/scripts/release.hs @@ -1,5 +1,5 @@ {- stack script - --resolver lts-22.28 + --resolver lts-22.43 --ghc-options -Wall -} @@ -7,7 +7,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. Stackage LTS Haskell 22.28 does not include boot packages +-- the snapshot. Stackage LTS Haskell 22.43 does not include boot packages -- directly. As GHC 9.6.6 boot packages Cabal and Cabal-syntax expose modules -- with the same names, the language extension PackageImports is required. diff --git a/src/Stack/Init.hs b/src/Stack/Init.hs index 2d38528534..374e148429 100644 --- a/src/Stack/Init.hs +++ b/src/Stack/Init.hs @@ -431,8 +431,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:" , "" - , "snapshot: lts-22.28" - , "snapshot: nightly-2024-07-05" + , "snapshot: lts-22.43" + , "snapshot: nightly-2024-12-07" , "snapshot: ghc-9.6.6" , "" , "The location of a snapshot can be provided as a file or url. Stack assumes" diff --git a/stack.yaml b/stack.yaml index 4a16ff3e7f..9c6306214d 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,19 +1,15 @@ -snapshot: lts-22.28 # GHC 9.6.6 +snapshot: lts-22.43 # GHC 9.6.6 extra-deps: -# lts-22.28 provides crypton-connection-0.3.2 +# lts-22.43 provides crypton-connection-0.3.2 - crypton-connection-0.4.1@sha256:a03dabfac16fcc58b4089c2f75ad1e97fc71c4a44f3aeb790db65cebb9ebd1d0,1590 -# lts-22.28 provides hi-file-parser-0.1.6.0 -- hi-file-parser-0.1.7.0@sha256:6cb54bc4bcc07c3b4c7b5dca73bc81e6b052636dc212eb6791608e70aab1ddfe,3012 -# lts-22.28 provides hpack-0.36.0 +# lts-22.43 provides hpack-0.36.1 - hpack-0.37.0@sha256:b7c91b0416a55c134172a9fd9a02f3815ba68c4b92cca4e320c36906d5e970e0,5187 -# lts-22.28 provides pantry-0.9.3.2. +# lts-22.43 provides pantry-0.9.3.2. - pantry-0.10.0@sha256:d13f99099753b0acf0695a00dc4d82f2671d3c604161d169ac0fc8fcf3004dec,7912 -# lts-22.28 provides static-bytes-0.1.0 -- static-bytes-0.1.1@sha256:e090886a4752a816cfff7ccb2c51c533cc8e39ec2d27e485427577fc92d9e9f9,1627 -# lts-22.28 provides tar-0.5.1.1, which does not support Unicode filenames: +# lts-22.43 provides tar-0.5.1.1, which does not support Unicode filenames: - tar-0.6.2.0@sha256:619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba,4576 -# lts-22.28 provides tls-1.8.0 +# lts-22.43 provides tls-1.8.0 - tls-2.1.0@sha256:39f9a6183a6dafc3365e99f4f3b99a55154f8a3a3114d9475459a066f56a3a32,6173 docker: diff --git a/stack.yaml.lock b/stack.yaml.lock index 718efbee70..67627f4fd2 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -11,13 +11,6 @@ packages: size: 394 original: hackage: crypton-connection-0.4.1@sha256:a03dabfac16fcc58b4089c2f75ad1e97fc71c4a44f3aeb790db65cebb9ebd1d0,1590 -- completed: - hackage: hi-file-parser-0.1.7.0@sha256:6cb54bc4bcc07c3b4c7b5dca73bc81e6b052636dc212eb6791608e70aab1ddfe,3012 - pantry-tree: - sha256: 6aa8f0023bb0ea61d62c3b60ffa5720d497847bc55c7f0e50254acc30f9bfe68 - size: 2693 - original: - hackage: hi-file-parser-0.1.7.0@sha256:6cb54bc4bcc07c3b4c7b5dca73bc81e6b052636dc212eb6791608e70aab1ddfe,3012 - completed: hackage: hpack-0.37.0@sha256:b7c91b0416a55c134172a9fd9a02f3815ba68c4b92cca4e320c36906d5e970e0,5187 pantry-tree: @@ -32,13 +25,6 @@ packages: size: 2722 original: hackage: pantry-0.10.0@sha256:d13f99099753b0acf0695a00dc4d82f2671d3c604161d169ac0fc8fcf3004dec,7912 -- completed: - hackage: static-bytes-0.1.1@sha256:e090886a4752a816cfff7ccb2c51c533cc8e39ec2d27e485427577fc92d9e9f9,1627 - pantry-tree: - sha256: 505d5c1a9a89bb60cd21639bd9a4ce0e3f043dc7b8ed42e47c6b2eb0b89d2524 - size: 440 - original: - hackage: static-bytes-0.1.1@sha256:e090886a4752a816cfff7ccb2c51c533cc8e39ec2d27e485427577fc92d9e9f9,1627 - completed: hackage: tar-0.6.2.0@sha256:619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba,4576 pantry-tree: @@ -55,7 +41,7 @@ packages: hackage: tls-2.1.0@sha256:39f9a6183a6dafc3365e99f4f3b99a55154f8a3a3114d9475459a066f56a3a32,6173 snapshots: - completed: - sha256: 87da71cb0ae9ee1ea1bf51a8eb9812f39f779be76abc0a3c926defd8afda05d1 - size: 719139 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/28.yaml - original: lts-22.28 + sha256: 08bd13ce621b41a8f5e51456b38d5b46d7783ce114a50ab604d6bbab0d002146 + size: 720271 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/43.yaml + original: lts-22.43 diff --git a/tests/integration/lib/StackTest.hs b/tests/integration/lib/StackTest.hs index 281411f30c..5d91f635e4 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.28" +defaultSnapshotArg = "--snapshot=lts-22.43" -- | Remove a file and ignore any warnings about missing files. removeFileIgnore :: HasCallStack => FilePath -> IO () 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 9b769eccf4..efa2c07952 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.28 +snapshot: lts-22.43 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 14917bff45..c5e03a1c12 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.28 +snapshot: lts-22.43 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 1c57b227ee..34a925f5f2 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.28 +snapshot: lts-22.43 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 8ea191881c..5e67a27be5 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.28 +snapshot: lts-22.43 diff --git a/tests/integration/tests/1659-skip-component/files/stack.yaml b/tests/integration/tests/1659-skip-component/files/stack.yaml index 8ea191881c..5e67a27be5 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.28 +snapshot: lts-22.43 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 b48cf3f905..56e9c871f6 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.28 +snapshot: lts-22.43 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 8ea191881c..5e67a27be5 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.28 +snapshot: lts-22.43 diff --git a/tests/integration/tests/32-unlisted-module/files/stack.yaml b/tests/integration/tests/32-unlisted-module/files/stack.yaml index 8ea191881c..5e67a27be5 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.28 +snapshot: lts-22.43 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 8ea191881c..5e67a27be5 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.28 +snapshot: lts-22.43 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 8ea191881c..5e67a27be5 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.28 +snapshot: lts-22.43 diff --git a/tests/integration/tests/345-override-bytestring/files/stack.yaml b/tests/integration/tests/345-override-bytestring/files/stack.yaml index b1e9ae2dfc..e44f3d89c9 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.28 +snapshot: lts-22.43 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 d30590ba6d..caea8d02fa 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.28 +snapshot: lts-22.43 packages: - ./local-mmorph 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 8ea191881c..5e67a27be5 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.28 +snapshot: lts-22.43 diff --git a/tests/integration/tests/365-invalid-success/files/stack.yaml b/tests/integration/tests/365-invalid-success/files/stack.yaml index 8ea191881c..5e67a27be5 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.28 +snapshot: lts-22.43 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 8ea191881c..5e67a27be5 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.28 +snapshot: lts-22.43 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 8ea191881c..5e67a27be5 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.28 +snapshot: lts-22.43 diff --git a/tests/integration/tests/3863-purge-command/files/stack.yaml b/tests/integration/tests/3863-purge-command/files/stack.yaml index 8ea191881c..5e67a27be5 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.28 +snapshot: lts-22.43 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 6d986f1525..62a760ea5a 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.28 +snapshot: lts-22.43 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 8ea191881c..5e67a27be5 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.28 +snapshot: lts-22.43 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 ae6a2fb4e1..6cfe4c810d 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.28 +resolver: lts-22.43 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 8ea191881c..5e67a27be5 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.28 +snapshot: lts-22.43 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 8ea191881c..5e67a27be5 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.28 +snapshot: lts-22.43 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 8ea191881c..5e67a27be5 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.28 +snapshot: lts-22.43 diff --git a/tests/integration/tests/4101-dependency-tree/files/stack.yaml b/tests/integration/tests/4101-dependency-tree/files/stack.yaml index 70b66cd79f..3f0f84c797 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.28 +snapshot: lts-22.43 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 8ea191881c..5e67a27be5 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.28 +snapshot: lts-22.43 diff --git a/tests/integration/tests/4270-files-order/files/stack.yaml b/tests/integration/tests/4270-files-order/files/stack.yaml index 8ea191881c..5e67a27be5 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.28 +snapshot: lts-22.43 diff --git a/tests/integration/tests/4453-detailed/files/stack.yaml b/tests/integration/tests/4453-detailed/files/stack.yaml index 8ea191881c..5e67a27be5 100644 --- a/tests/integration/tests/4453-detailed/files/stack.yaml +++ b/tests/integration/tests/4453-detailed/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-22.28 +snapshot: lts-22.43 diff --git a/tests/integration/tests/4783-doctest-deps/files/snapshot.yaml b/tests/integration/tests/4783-doctest-deps/files/snapshot.yaml index 1a14c6d3fa..eab06a382d 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.28 +snapshot: lts-22.43 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 dc80cda802..74fba45019 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.28 +snapshot: lts-22.43 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 8ea191881c..5e67a27be5 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.28 +snapshot: lts-22.43 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 0a8a83e2d1..a7f5dec535 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.28 +snapshot: lts-22.43 ghc-options: "$locals": -j8 +RTS -s -A128M 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 283ee28eeb..9a2060ed01 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.28 +snapshot: lts-22.43 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 283ee28eeb..9a2060ed01 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.28 +snapshot: lts-22.43 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 8ea191881c..5e67a27be5 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.28 +snapshot: lts-22.43 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 8ea191881c..5e67a27be5 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.28 +snapshot: lts-22.43 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 8ea191881c..5e67a27be5 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.28 +snapshot: lts-22.43 diff --git a/tests/integration/tests/620-env-command/files/run.sh b/tests/integration/tests/620-env-command/files/run.sh index afea0d8986..28c506a0a0 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.28 async -eval `stack config env --resolver lts-22.28` +stack build --resolver lts-22.43 async +eval `stack config env --resolver lts-22.43` 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 8ea191881c..5e67a27be5 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.28 +snapshot: lts-22.43 diff --git a/tests/integration/tests/6465-msys-environment/files/stack.yaml b/tests/integration/tests/6465-msys-environment/files/stack.yaml index 0ca6e916c6..7b9d6b3b60 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.28 +snapshot: lts-22.43 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 ae34b27e49..a8bfa28651 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.28 +snapshot: lts-22.43 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 8ea191881c..5e67a27be5 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.28 +snapshot: lts-22.43 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 eb741bfeb4..9917c4b311 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.28 +snapshot: lts-22.43 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 dbdbc688fc..d6129cf2e6 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.28" + writeFile "stack.yaml" "snapshot: lts-22.43" stack ["build", "--dry-run"] stack ["build"] diff --git a/tests/integration/tests/cabal-sublibrary-dependency/files/stack.yaml b/tests/integration/tests/cabal-sublibrary-dependency/files/stack.yaml index be447d7c7e..024c6206e3 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.28 # GHC 9.6.6 +snapshot: lts-22.43 packages: - . - subproject diff --git a/tests/integration/tests/drop-packages/files/stack.yaml b/tests/integration/tests/drop-packages/files/stack.yaml index 5d03f5074d..9ec3735824 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.28 +snapshot: lts-22.43 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 1dfba07cc0..85c99f1dc0 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.28 +snapshot: lts-22.43 packages: [] diff --git a/tests/integration/tests/duplicate-package-ids/files/stack2.yaml b/tests/integration/tests/duplicate-package-ids/files/stack2.yaml index b5cb79a0f8..17556aac34 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.28 +snapshot: lts-22.43 packages: - auto-update-0.1.2.1 diff --git a/tests/integration/tests/haddock-options/files/stack.yaml b/tests/integration/tests/haddock-options/files/stack.yaml index 8c9a01e562..434183de46 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.28 +snapshot: lts-22.43 build: haddock-arguments: diff --git a/tests/integration/tests/hpack-repo/files/stack.yaml b/tests/integration/tests/hpack-repo/files/stack.yaml index 7cd8e959d5..102fab7814 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.28 +snapshot: lts-22.43 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 aa03e0a5aa..466cb29042 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.28"] - stack ["init", "--snapshot", "lts-22.28", "--omit-packages"] + stackErr ["init", "--snapshot", "lts-22.43"] + stack ["init", "--snapshot", "lts-22.43", "--omit-packages"] contents <- lines <$> readFile "stack.yaml" unless ("#- bad" `elem` contents) $ error "commented out 'bad' package was expected" diff --git a/tests/integration/tests/lock-files/files/stack-1-extra b/tests/integration/tests/lock-files/files/stack-1-extra index 1f7504f970..80d32681d9 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.28 +resolver: lts-22.43 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 48d2f19ca5..f10fccfd8e 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.28 +resolver: lts-22.43 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 8ea191881c..5e67a27be5 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.28 +snapshot: lts-22.43 diff --git a/tests/integration/tests/multi-test/files/stack.yaml b/tests/integration/tests/multi-test/files/stack.yaml index b895dbe6e2..a7d2113a85 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.28 +snapshot: lts-22.43 packages: - . - sub-package diff --git a/tests/integration/tests/mutable-deps/files/stack.yaml b/tests/integration/tests/mutable-deps/files/stack.yaml index 8b3e1d43f4..00376e420d 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.28 +snapshot: lts-22.43 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 687377a660..558fa23a31 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.28"] $ \snapshot -> do + for_ ["lts-20.26", "lts-22.43"] $ \snapshot -> do stack ["init", "--force", "--snapshot", snapshot] str <- readFile "stack.yaml" case mapMaybe (stripPrefix "snapshot: ") $ lines str of diff --git a/tests/integration/tests/upload/files/stack.yaml b/tests/integration/tests/upload/files/stack.yaml index ae5d986ae0..c2860e22c6 100644 --- a/tests/integration/tests/upload/files/stack.yaml +++ b/tests/integration/tests/upload/files/stack.yaml @@ -1,2 +1,2 @@ -snapshot: lts-22.28 +snapshot: lts-22.43 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 8ea191881c..5e67a27be5 100644 --- a/tests/integration/tests/watched-files/files/stack.yaml +++ b/tests/integration/tests/watched-files/files/stack.yaml @@ -1 +1 @@ -snapshot: lts-22.28 +snapshot: lts-22.43 diff --git a/tests/unit/Stack/ConfigSpec.hs b/tests/unit/Stack/ConfigSpec.hs index 30037c22a0..beefb315f2 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.28\n" ++ + "snapshot: lts-22.43\n" ++ "packages: ['.']\n" buildOptsConfig :: String buildOptsConfig = - "snapshot: lts-22.28\n" ++ + "snapshot: lts-22.43\n" ++ "packages: ['.']\n" ++ "build:\n" ++ " library-profiling: true\n" ++ @@ -104,7 +104,7 @@ buildOptsConfig = buildOptsHaddockForHackageConfig :: String buildOptsHaddockForHackageConfig = - "snapshot: lts-22.28\n" ++ + "snapshot: lts-22.43\n" ++ "packages: ['.']\n" ++ "build:\n" ++ " haddock: true\n" ++ @@ -120,24 +120,24 @@ buildOptsHaddockForHackageConfig = hpackConfig :: String hpackConfig = - "snapshot: lts-22.28\n" ++ + "snapshot: lts-22.43\n" ++ "with-hpack: /usr/local/bin/hpack\n" ++ "packages: ['.']\n" resolverConfig :: String resolverConfig = - "resolver: lts-22.28\n" ++ + "resolver: lts-22.43\n" ++ "packages: ['.']\n" snapshotConfig :: String snapshotConfig = - "snapshot: lts-22.28\n" ++ + "snapshot: lts-22.43\n" ++ "packages: ['.']\n" resolverSnapshotConfig :: String resolverSnapshotConfig = - "resolver: lts-22.28\n" ++ - "snapshot: lts-22.28\n" ++ + "resolver: lts-22.43\n" ++ + "snapshot: lts-22.43\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 28) + project.snapshot `shouldBe` RSLSynonym (LTS 22 43) it "parses snapshot using 'snapshot'" $ inTempDir $ do loadProject snapshotConfig $ \project -> - project.snapshot `shouldBe` RSLSynonym (LTS 22 28) + project.snapshot `shouldBe` RSLSynonym (LTS 22 43) it "throws if both 'resolver' and 'snapshot' are present" $ inTempDir $ do loadProject resolverSnapshotConfig (const (pure ()))