From 921f62bfd55443a909d4b6d4d20d7ebd7ad8ed0a Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Sun, 24 Sep 2023 22:16:49 +0100 Subject: [PATCH] Bump to Stackage LTS Haskell 21.13 --- cabal.project | 2 +- doc/GUIDE.md | 12 +++++----- doc/Stack_and_VS_Code.md | 2 +- doc/custom_snapshot.md | 22 +++++++++---------- doc/faq.md | 6 ++--- doc/list_command.md | 6 ++--- doc/script_command.md | 4 ++-- doc/scripts.md | 20 ++++++++--------- doc/stack_yaml_vs_cabal_package_file.md | 4 ++-- doc/yaml_configuration.md | 6 ++--- etc/scripts/build-stack-installer.hs | 2 +- etc/scripts/release.hs | 4 ++-- src/Stack/Init.hs | 4 ++-- stack-ghc-9.6.2.yaml | 5 +---- stack-ghc-9.6.2.yaml.lock | 17 +++++--------- stack.yaml | 5 ++--- stack.yaml.lock | 15 ++++--------- 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 ++-- .../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 +- 74 files changed, 118 insertions(+), 136 deletions(-) diff --git a/cabal.project b/cabal.project index 6eefa92bbd..0daeaf62f9 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-21.12/cabal.config. +-- https://www.stackage.org/lts-21.13/cabal.config. -- with-compiler: ghc-9.4.7 import: cabal.config diff --git a/doc/GUIDE.md b/doc/GUIDE.md index 4277d8a165..46542a0c48 100644 --- a/doc/GUIDE.md +++ b/doc/GUIDE.md @@ -255,7 +255,7 @@ packages: The value of the `resolver` key tells Stack *how* to build your package: which GHC version to use, versions of package dependencies, and so on. Our value here -says to use [LTS Haskell 21.12](https://www.stackage.org/lts-21.12), which +says to use [LTS Haskell 21.13](https://www.stackage.org/lts-21.13), which implies GHC 9.4.7 (which is why `stack build` installs that version of GHC if it is not already available to Stack). There are a number of values you can use for `resolver`, which we'll cover later. @@ -503,7 +503,7 @@ also known as *snapshots*. We mentioned the LTS resolvers, and you can get quite a bit of information about it at [https://www.stackage.org/lts](https://www.stackage.org/lts), including: -* The appropriate resolver value (`resolver: lts-21.12`, as is currently the +* The appropriate resolver value (`resolver: lts-21.13`, as is currently the latest LTS) * The GHC version used * A full list of all packages available in this snapshot @@ -522,16 +522,16 @@ towards by default as well). ## Resolvers and changing your compiler version -Let's explore package sets a bit further. Instead of `lts-21.12`, let's change +Let's explore package sets a bit further. Instead of `lts-21.13`, let's change our `stack.yaml` file to use the [latest nightly](https://www.stackage.org/nightly). Right now, this is currently -2023-09-16 - please see the resolver from the link above to get the latest. +2023-09-24 - please see the resolver from the link above to get the latest. Then, commanding `stack build` again will produce: ~~~text stack build -# Downloaded nightly-2023-09-16 build plan. +# Downloaded nightly-2023-09-24 build plan. # build output ... ~~~ @@ -1340,7 +1340,7 @@ yields output like: ~~~text Run from outside a project, using implicit global project config -Using latest snapshot resolver: lts-21.12 +Using latest snapshot resolver: lts-21.13 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 ce8ba79105..4904e313b0 100644 --- a/doc/Stack_and_VS_Code.md +++ b/doc/Stack_and_VS_Code.md @@ -75,7 +75,7 @@ enabled). For further information about these options, see the `install-ghc` For this workaround to work, each time that a resolver is used that references a different version of GHC, then GHCup must be used to install it (if GHCup has -not already installed that version). For example, to use `resolver: lts-21.12` +not already installed that version). For example, to use `resolver: lts-21.13` (GHC 9.4.7), the command `ghcup install ghc 9.4.7` must have been used to install GHC 9.4.7. That may be a minor inconvenience for some people, as one the primary benefits of Stack over other Haskell build tools has been that Stack diff --git a/doc/custom_snapshot.md b/doc/custom_snapshot.md index f48e4b746a..f7d0d30029 100644 --- a/doc/custom_snapshot.md +++ b/doc/custom_snapshot.md @@ -17,7 +17,7 @@ available in snapshots to ensure reproducibility. snapshot specification. ~~~yaml -resolver: lts-21.12 # Inherits GHC version and package set +resolver: lts-21.13 # Inherits GHC version and package set compiler: ghc-9.6.2 # Overwrites GHC version in the resolver, optional # Additional packages, follows extra-deps syntax @@ -61,35 +61,35 @@ custom snapshot, due to Stack sharing snapshot packages whenever possible. ### Overriding the compiler -The following snapshot specification will be identical to `lts-21.12`, but +The following snapshot specification will be identical to `lts-21.13`, but instead use `ghc-9.4.5` instead of `ghc-9.4.7`: ~~~yaml -resolver: lts-21.12 +resolver: lts-21.13 compiler: ghc-9.4.5 ~~~ ### Dropping packages -The following snapshot specification will be identical to `lts-21.12`, but +The following snapshot specification will be identical to `lts-21.13`, but without the `text` package in our snapshot. Removing this package will cause all the packages that depend on `text` to be unbuildable, but they will still be present in the snapshot. ~~~yaml -resolver: lts-21.12 +resolver: lts-21.13 drop-packages: - text ~~~ ### Hiding packages -The following snapshot specification will be identical to `lts-21.12`, but the +The following snapshot specification will be identical to `lts-21.13`, but the `text` package will be hidden when registering. This will affect, for example, the import parser in the script command. ~~~yaml -resolver: lts-21.12 +resolver: lts-21.13 hidden: - text ~~~ @@ -99,11 +99,11 @@ hidden: In order to specify GHC options for a package, you use the same syntax as the [ghc-options](yaml_configuration.md#ghc-options) key for build configuration. -The following snapshot specification will be identical to `lts-21.12`, but +The following snapshot specification will be identical to `lts-21.13`, but provides `-O1` as a ghc-option for `text`: ~~~yaml -resolver: lts-21.12 +resolver: lts-21.13 packages: - text-2.0.2 ghc-options: @@ -122,11 +122,11 @@ packages in the `packages` list, rather than all packages in the snapshot. In order to specify Cabal flags for a package, you use the same syntax as the [flags](yaml_configuration.md#flags) key for build configuration. The -following snapshot specification will be identical to `lts-21.12`, but +following snapshot specification will be identical to `lts-21.13`, but it enables the `developer` Cabal flag: ~~~yaml -resolver: lts-21.12 +resolver: lts-21.13 packages: - text-2.0.2 flags: diff --git a/doc/faq.md b/doc/faq.md index 69d8db6505..bd85093f05 100644 --- a/doc/faq.md +++ b/doc/faq.md @@ -9,7 +9,7 @@ here is to be as helpful and concise as possible. ## What version of GHC is used when I run something like `stack ghci`? The version of GHC, as well as which packages can be installed, are specified by -the _resolver_. This may be something like `lts-21.12`, which is from +the _resolver_. This may be something like `lts-21.13`, which is from [Stackage](https://www.stackage.org/). The [user's guide](GUIDE.md) discusses the resolver in more detail. @@ -76,7 +76,7 @@ You can make tweaks to a snapshot by modifying the `extra-deps` configuration value in your `stack.yaml` file, e.g.: ~~~yaml -resolver: lts-21.12 +resolver: lts-21.13 packages: - . extra-deps: @@ -91,7 +91,7 @@ Add it to the directory where your `stack.yaml` file lives, e.g. ~~~yaml -resolver: lts-21.12 +resolver: lts-21.13 packages: - . extra-deps: diff --git a/doc/list_command.md b/doc/list_command.md index b84b3bb8d2..dd69435404 100644 --- a/doc/list_command.md +++ b/doc/list_command.md @@ -44,17 +44,17 @@ Error: [S-4926] pantry, pretty, pasty, xattr, alloy, para, pappy, alure, polar and factory. -stack --resolver lts-21.12 list base unix Win32 acme-missiles pantry +stack --resolver lts-21.13 list base unix Win32 acme-missiles pantry Error: [S-4926] * Package does not appear in snapshot: base. * Package does not appear in snapshot: unix. * Package does not appear in snapshot: Win32. * Package does not appear in snapshot: acme-missiles. -stack --resolver lts-21.12 list pantry +stack --resolver lts-21.13 list pantry pantry-0.8.3 -stack --resolver lts-21.12 list +stack --resolver lts-21.13 list AC-Angle-1.0 ALUT-2.4.0.3 ... diff --git a/doc/script_command.md b/doc/script_command.md index 77b219224b..849e2dc244 100644 --- a/doc/script_command.md +++ b/doc/script_command.md @@ -18,7 +18,7 @@ configuration files (global and project-level). A snapshot must be specified on the command line (with the `--resolver` option). For example: ~~~text -stack script --resolver lts-21.12 MyScript.hs +stack script --resolver lts-21.13 MyScript.hs ~~~ The `stack script` command behaves as if the `--install-ghc` flag had been @@ -100,7 +100,7 @@ main = do can be compiled and run, with arguments, with: ~~~text -stack --resolver lts-21.12 script --package acme-missiles --compile MyScript.hs -- "Don't panic!" "Duck and cover!" +stack --resolver lts-21.13 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 5b0d17c26a..852674e9ae 100644 --- a/doc/scripts.md +++ b/doc/scripts.md @@ -19,7 +19,7 @@ An example will be easiest to understand. Consider the Haskell source file ~~~haskell #!/usr/bin/env stack --- stack script --resolver lts-21.12 --package turtle +-- stack script --resolver lts-21.13 --package turtle {-# LANGUAGE OverloadedStrings #-} import Turtle (echo) main = echo "Hello World!" @@ -78,10 +78,10 @@ able to reuse everything already built). The second line of the source code is the Stack interpreter options comment. In this example, it specifies the `stack script` command with the options of a -LTS Haskell 21.12 snapshot (`--resolver lts-21.12`) and ensuring the +LTS Haskell 21.13 snapshot (`--resolver lts-21.13`) and ensuring the [`turtle` package](https://hackage.haskell.org/package/turtle) is available (`--package turtle`). The version of the package will be that in the specified -snapshot (`lts-21.12` provides `turtle-1.6.1`). +snapshot (`lts-21.13` provides `turtle-1.6.1`). ## Arguments and interpreter options and arguments @@ -116,7 +116,7 @@ For example, the command `stack MyScript.hs arg1 arg2` with `MyScript.hs`: ~~~haskell #!/usr/bin/env stack {- stack script - --resolver lts-21.12 + --resolver lts-21.13 -- +RTS -s -RTS -} @@ -132,7 +132,7 @@ main = do is equivalent to the following command at the command line: ~~~text -stack script --resolver lts-21.12 -- MyScript.hs arg1 arg2 +RTS -s -RTS +stack script --resolver lts-21.13 -- MyScript.hs arg1 arg2 +RTS -s -RTS ~~~ where `+RTS -s -RTS` are some of GHC's @@ -161,7 +161,7 @@ space separated list. For example: ~~~haskell #!/usr/bin/env stack {- stack script - --resolver lts-21.12 + --resolver lts-21.13 --package turtle --package "stm async" --package http-client,http-conduit @@ -191,7 +191,7 @@ which makes use of the joke package ~~~haskell {- stack script - --resolver lts-21.12 + --resolver lts-21.13 --package acme-missiles -} import Acme.Missiles (launchMissiles) @@ -202,7 +202,7 @@ main = launchMissiles The command `stack --script-no-run-compile Script.hs` then behaves as if the command -`stack script --resolver lts-21.12 --package acme-missiles --no-run --compile -- Script.hs` +`stack script --resolver lts-21.13 --package acme-missiles --no-run --compile -- Script.hs` had been given. `Script.hs` is compiled (without optimisation) and the resulting executable is not run: no missiles are launched in the process! @@ -239,7 +239,7 @@ example with `runghc`: {- stack runghc --install-ghc - --resolver lts-21.12 + --resolver lts-21.13 --package base --package turtle -- @@ -262,7 +262,7 @@ it. Here is an example: {- stack exec ghci --install-ghc - --resolver lts-21.12 + --resolver lts-21.13 --package turtle -} ~~~ diff --git a/doc/stack_yaml_vs_cabal_package_file.md b/doc/stack_yaml_vs_cabal_package_file.md index 29fdc9444e..8de582e33b 100644 --- a/doc/stack_yaml_vs_cabal_package_file.md +++ b/doc/stack_yaml_vs_cabal_package_file.md @@ -64,8 +64,8 @@ requires that you have chosen a specific version for each package available. The most common means by which this set of packages is defined is via a snapshot provided by Stackage. For example, if you go to the page -, you will see a list of 3,010 packages at -specific version numbers. When you then specify `resolver: lts-21.12`, you're +, you will see a list of 3,010 packages at +specific version numbers. When you then specify `resolver: lts-21.13`, you're telling Stack to use those package versions in resolving dependencies down to specific versions of packages. diff --git a/doc/yaml_configuration.md b/doc/yaml_configuration.md index 8f223ae64f..89fec5e100 100644 --- a/doc/yaml_configuration.md +++ b/doc/yaml_configuration.md @@ -98,8 +98,8 @@ installation, and various settings like build flags. It is called a resolver since a snapshot states how dependencies are resolved. There are currently four resolver types: -* LTS Haskell snapshots, e.g. `resolver: lts-21.12` -* Stackage Nightly snapshots, e.g. `resolver: nightly-2023-09-16` +* LTS Haskell snapshots, e.g. `resolver: lts-21.13` +* Stackage Nightly snapshots, e.g. `resolver: nightly-2023-09-24` * No snapshot, just use packages shipped with the compiler. For GHC this looks like `resolver: ghc-9.6.2` * Custom snapshot, via a URL or relative file path. For further information, see @@ -536,7 +536,7 @@ resolvers like `ghc-9.6.2`. This can be used to override the compiler for a Stackage snapshot, like this: ~~~yaml -resolver: lts-21.12 +resolver: lts-21.13 compiler: ghc-9.6.2 compiler-check: match-exact ~~~ diff --git a/etc/scripts/build-stack-installer.hs b/etc/scripts/build-stack-installer.hs index 922f9aa14e..cd31e55cb2 100644 --- a/etc/scripts/build-stack-installer.hs +++ b/etc/scripts/build-stack-installer.hs @@ -1,5 +1,5 @@ {- stack script - --resolver lts-21.12 + --resolver lts-21.13 --install-ghc --package nsis -} diff --git a/etc/scripts/release.hs b/etc/scripts/release.hs index af82418048..df011f5eb8 100644 --- a/etc/scripts/release.hs +++ b/etc/scripts/release.hs @@ -1,5 +1,5 @@ {- stack script - --resolver lts-21.12 + --resolver lts-21.13 --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 21.12 does not include boot packages +-- the snapshot. Stackage LTS Haskell 21.13 does not include boot packages -- directly. As GHC 9.4.7 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 be4f1cb0fb..1245ff15cf 100644 --- a/src/Stack/Init.hs +++ b/src/Stack/Init.hs @@ -421,8 +421,8 @@ renderStackYaml p ignoredPackages dupPackages = , "A snapshot resolver dictates the compiler version and the set of packages" , "to be used for project dependencies. For example:" , "" - , "resolver: lts-21.12" - , "resolver: nightly-2023-09-16" + , "resolver: lts-21.13" + , "resolver: nightly-2023-09-24" , "resolver: ghc-9.6.2" , "" , "The location of a snapshot can be provided as a file or url. Stack assumes" diff --git a/stack-ghc-9.6.2.yaml b/stack-ghc-9.6.2.yaml index 18cc47f8cd..951ca2932c 100644 --- a/stack-ghc-9.6.2.yaml +++ b/stack-ghc-9.6.2.yaml @@ -2,10 +2,7 @@ # built with GHC 9.6.2. # GHC 9.6.2 -resolver: nightly-2023-09-22 - -extra-deps: -- rio-prettyprint-0.1.7.0@sha256:4f0f2dabcbc3be1f9871de7c2ff3d090b82462ca5924afa24f7b2540c5511d84,1428 +resolver: nightly-2023-09-24 docker: enable: false diff --git a/stack-ghc-9.6.2.yaml.lock b/stack-ghc-9.6.2.yaml.lock index 49c8f31b23..5524857641 100644 --- a/stack-ghc-9.6.2.yaml.lock +++ b/stack-ghc-9.6.2.yaml.lock @@ -3,17 +3,10 @@ # For more information, please see the documentation at: # https://docs.haskellstack.org/en/stable/lock_files -packages: -- completed: - hackage: rio-prettyprint-0.1.7.0@sha256:4f0f2dabcbc3be1f9871de7c2ff3d090b82462ca5924afa24f7b2540c5511d84,1428 - pantry-tree: - sha256: 5d18c4b8e4a0a959ab3e8544ea1baae1674ebbe01f379a2a75215c05f7d255ee - size: 779 - original: - hackage: rio-prettyprint-0.1.7.0@sha256:4f0f2dabcbc3be1f9871de7c2ff3d090b82462ca5924afa24f7b2540c5511d84,1428 +packages: [] snapshots: - completed: - sha256: 93137bc0122de394fa2c43e933971b2996cd7dc600989b721ad971810b9a2f3f - size: 669537 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/9/22.yaml - original: nightly-2023-09-22 + sha256: b7a0a7e0137557ae2caa9d4f20fcca1f8b190e5098a5d54e6c5166b3e88856a5 + size: 669538 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/9/24.yaml + original: nightly-2023-09-24 diff --git a/stack.yaml b/stack.yaml index 550abd0aef..288b0963ea 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-21.12 # GHC 9.4.7 +resolver: lts-21.13 # GHC 9.4.7 extra-deps: - aeson-warning-parser-0.1.0@sha256:f2c1c42b73aa35d352060abcbb867c410cbbf57d0cb0fed607bcd1e2a74954ad,1308 @@ -13,14 +13,13 @@ extra-deps: - crypton-x509-store-1.6.9@sha256:422b9b9f87a7382c66385d047615b16fc86a68c08ea22b1e0117c143a2d44050,1750 - crypton-x509-system-1.6.7@sha256:023ed573d82983bc473a37a89e0434a085b413be9f68d07e085361056afd4637,1532 - crypton-x509-validation-1.6.12@sha256:85989721b64be4b90de9f66ef641c26f57575cffed1a50d707065fb60176f386,2227 -# lts-21.12 specifies hpack-0.35.2 +# lts-21.13 specifies hpack-0.35.2 - hpack-0.36.0@sha256:c2daa6556afc57367a5d1dbd878bf515d442d201e24b27473051359abd47ed08,5187 - http-client-tls-0.3.6.3@sha256:a5909ce412ee65c141b8547f8fe22236f175186c95c708e86a46b5547394f910,2046 - http-download-0.2.1.0@sha256:a97863e96f7d44efc3d0e3061db7fe2540b8374ca44ae90d0b56040140cb7506,1716 - optparse-applicative-0.18.1.0@sha256:b4cf8d9018e5e67cb1f14edb5130b6d05ad8bc1b5f6bd4efaa6ec0b7f28f559d,5132 - optparse-generic-1.5.1@sha256:c65a7d3429feedf870f5a9f7f0d2aaf75609888b52449f85f22871b5f5a7e95f,2204 - pantry-0.9.2@sha256:e1c5444d1b4003435d860853abd21e91e5fc337f2b2e2c8c992a2bac04712dc0,7650 -- rio-prettyprint-0.1.7.0@sha256:4f0f2dabcbc3be1f9871de7c2ff3d090b82462ca5924afa24f7b2540c5511d84,1428 - static-bytes-0.1.0@sha256:35dbf30f617baa0151682c97687042516be07872a39984f9fe31f78125b962bf,1627 - tar-conduit-0.4.0@sha256:f333649770f5ec42a83a93b0d424cf6bb895d80dfbee05a54340395f81d036ae,3126 - tls-1.9.0@sha256:8ad332dc0224decb1b137bf6c9678b4f786487b9aaa5c9068cd3ad19d42c39a7,5571 diff --git a/stack.yaml.lock b/stack.yaml.lock index 917be59e96..01e3dcbcf9 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -116,13 +116,6 @@ packages: size: 2665 original: hackage: pantry-0.9.2@sha256:e1c5444d1b4003435d860853abd21e91e5fc337f2b2e2c8c992a2bac04712dc0,7650 -- completed: - hackage: rio-prettyprint-0.1.7.0@sha256:4f0f2dabcbc3be1f9871de7c2ff3d090b82462ca5924afa24f7b2540c5511d84,1428 - pantry-tree: - sha256: 5d18c4b8e4a0a959ab3e8544ea1baae1674ebbe01f379a2a75215c05f7d255ee - size: 779 - original: - hackage: rio-prettyprint-0.1.7.0@sha256:4f0f2dabcbc3be1f9871de7c2ff3d090b82462ca5924afa24f7b2540c5511d84,1428 - completed: hackage: static-bytes-0.1.0@sha256:35dbf30f617baa0151682c97687042516be07872a39984f9fe31f78125b962bf,1627 pantry-tree: @@ -146,7 +139,7 @@ packages: hackage: tls-1.9.0@sha256:8ad332dc0224decb1b137bf6c9678b4f786487b9aaa5c9068cd3ad19d42c39a7,5571 snapshots: - completed: - sha256: 9313df78f49519315342f4c51ffc5da12659d3735f8ac3c54a1fb98ff874474e - size: 640036 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/12.yaml - original: lts-21.12 + sha256: 8017c7970c2a8a9510c60cc70ac245d59e0c34eb932b91d37af09fe59855d854 + size: 640038 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/13.yaml + original: lts-21.13 diff --git a/tests/integration/lib/StackTest.hs b/tests/integration/lib/StackTest.hs index fd065ad6bf..9c21a25fbc 100644 --- a/tests/integration/lib/StackTest.hs +++ b/tests/integration/lib/StackTest.hs @@ -363,7 +363,7 @@ isMacOSX = os == "darwin" -- the main @stack.yaml@. -- defaultResolverArg :: String -defaultResolverArg = "--resolver=lts-21.12" +defaultResolverArg = "--resolver=lts-21.13" -- | 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 5ece4c8e5d..855a5d4343 100644 --- a/tests/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml +++ b/tests/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml @@ -1,4 +1,4 @@ -resolver: lts-21.12 +resolver: lts-21.13 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 4e25b6daa9..271a24fe40 100644 --- a/tests/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml +++ b/tests/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml @@ -1,5 +1,5 @@ --- -resolver: lts-21.12 +resolver: lts-21.13 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 e9ea252002..4908bf7e49 100644 --- a/tests/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml +++ b/tests/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml @@ -1,5 +1,5 @@ --- -resolver: lts-21.12 +resolver: lts-21.13 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 6b71e0fe35..6c19768deb 100644 --- a/tests/integration/tests/1337-unicode-everywhere/files/stack.yaml +++ b/tests/integration/tests/1337-unicode-everywhere/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-21.12 +resolver: lts-21.13 packages: - '.' extra-deps: [] diff --git a/tests/integration/tests/1659-skip-component/files/stack.yaml b/tests/integration/tests/1659-skip-component/files/stack.yaml index 6b71e0fe35..6c19768deb 100644 --- a/tests/integration/tests/1659-skip-component/files/stack.yaml +++ b/tests/integration/tests/1659-skip-component/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-21.12 +resolver: lts-21.13 packages: - '.' extra-deps: [] diff --git a/tests/integration/tests/1884-url-to-tarball/files/stack.yaml b/tests/integration/tests/1884-url-to-tarball/files/stack.yaml index b0a227e965..bc2997a944 100644 --- a/tests/integration/tests/1884-url-to-tarball/files/stack.yaml +++ b/tests/integration/tests/1884-url-to-tarball/files/stack.yaml @@ -2,4 +2,4 @@ extra-deps: - location: https://hackage.haskell.org/package/half-0.2.2.3/half-0.2.2.3.tar.gz sha256: 85c244c80d1c889a3d79073a6f5a99d9e769dbe3c574ca11d992b2b4f7599a5c size: 6050 -resolver: lts-21.12 +resolver: lts-21.13 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 4c90061b0f..22d0aaa1a2 100644 --- a/tests/integration/tests/2195-depend-on-exe/files/stack.yaml +++ b/tests/integration/tests/2195-depend-on-exe/files/stack.yaml @@ -1 +1 @@ -resolver: lts-21.12 +resolver: lts-21.13 diff --git a/tests/integration/tests/32-unlisted-module/files/stack.yaml b/tests/integration/tests/32-unlisted-module/files/stack.yaml index 48a40374d3..97ff7b67ec 100644 --- a/tests/integration/tests/32-unlisted-module/files/stack.yaml +++ b/tests/integration/tests/32-unlisted-module/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-21.12 +resolver: lts-21.13 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 3a1ee17704..8acfc658f9 100644 --- a/tests/integration/tests/3315-multi-ghc-options/files/stack.yaml +++ b/tests/integration/tests/3315-multi-ghc-options/files/stack.yaml @@ -1,3 +1,3 @@ -resolver: lts-21.12 +resolver: lts-21.13 packages: - '.' diff --git a/tests/integration/tests/335-multi-package-flags/files/stack.yaml b/tests/integration/tests/335-multi-package-flags/files/stack.yaml index 48a40374d3..97ff7b67ec 100644 --- a/tests/integration/tests/335-multi-package-flags/files/stack.yaml +++ b/tests/integration/tests/335-multi-package-flags/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-21.12 +resolver: lts-21.13 diff --git a/tests/integration/tests/345-override-bytestring/files/stack.yaml b/tests/integration/tests/345-override-bytestring/files/stack.yaml index f2dc4a93b3..bbbb20eac5 100644 --- a/tests/integration/tests/345-override-bytestring/files/stack.yaml +++ b/tests/integration/tests/345-override-bytestring/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-21.12 +resolver: lts-21.13 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 6badefe54e..61d579ff77 100644 --- a/tests/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml +++ b/tests/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-21.12 +resolver: lts-21.13 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 4c90061b0f..22d0aaa1a2 100644 --- a/tests/integration/tests/3591-cabal-warnings-once/files/stack.yaml +++ b/tests/integration/tests/3591-cabal-warnings-once/files/stack.yaml @@ -1 +1 @@ -resolver: lts-21.12 +resolver: lts-21.13 diff --git a/tests/integration/tests/365-invalid-success/files/stack.yaml b/tests/integration/tests/365-invalid-success/files/stack.yaml index 48a40374d3..97ff7b67ec 100644 --- a/tests/integration/tests/365-invalid-success/files/stack.yaml +++ b/tests/integration/tests/365-invalid-success/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-21.12 +resolver: lts-21.13 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 48a40374d3..97ff7b67ec 100644 --- a/tests/integration/tests/366-non-root-dir/files/stack.yaml +++ b/tests/integration/tests/366-non-root-dir/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-21.12 +resolver: lts-21.13 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 4c90061b0f..22d0aaa1a2 100644 --- a/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml +++ b/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml @@ -1 +1 @@ -resolver: lts-21.12 +resolver: lts-21.13 diff --git a/tests/integration/tests/3863-purge-command/files/stack.yaml b/tests/integration/tests/3863-purge-command/files/stack.yaml index 48a40374d3..97ff7b67ec 100644 --- a/tests/integration/tests/3863-purge-command/files/stack.yaml +++ b/tests/integration/tests/3863-purge-command/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-21.12 +resolver: lts-21.13 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 0148ec5761..a0005518d4 100644 --- a/tests/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml +++ b/tests/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml @@ -1,3 +1,3 @@ -resolver: lts-21.12 +resolver: lts-21.13 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 4c90061b0f..22d0aaa1a2 100644 --- a/tests/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml +++ b/tests/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml @@ -1 +1 @@ -resolver: lts-21.12 +resolver: lts-21.13 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 ea19302f37..ee51599c1a 100644 --- a/tests/integration/tests/3942-solver-error-output/files/test-stack.yml +++ b/tests/integration/tests/3942-solver-error-output/files/test-stack.yml @@ -1,4 +1,4 @@ -resolver: lts-21.12 +resolver: lts-21.13 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 4c90061b0f..22d0aaa1a2 100644 --- a/tests/integration/tests/3959-order-of-flags/files/stack.yaml +++ b/tests/integration/tests/3959-order-of-flags/files/stack.yaml @@ -1 +1 @@ -resolver: lts-21.12 +resolver: lts-21.13 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 4c90061b0f..22d0aaa1a2 100644 --- a/tests/integration/tests/397-case-insensitive-flags/files/stack.yaml +++ b/tests/integration/tests/397-case-insensitive-flags/files/stack.yaml @@ -1 +1 @@ -resolver: lts-21.12 +resolver: lts-21.13 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 4c90061b0f..22d0aaa1a2 100644 --- a/tests/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml +++ b/tests/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml @@ -1 +1 @@ -resolver: lts-21.12 +resolver: lts-21.13 diff --git a/tests/integration/tests/4101-dependency-tree/files/stack.yaml b/tests/integration/tests/4101-dependency-tree/files/stack.yaml index 6d2b91d6a7..40e07889d6 100644 --- a/tests/integration/tests/4101-dependency-tree/files/stack.yaml +++ b/tests/integration/tests/4101-dependency-tree/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-21.12 +resolver: lts-21.13 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 4c90061b0f..22d0aaa1a2 100644 --- a/tests/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml +++ b/tests/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml @@ -1 +1 @@ -resolver: lts-21.12 +resolver: lts-21.13 diff --git a/tests/integration/tests/4270-files-order/files/stack.yaml b/tests/integration/tests/4270-files-order/files/stack.yaml index 9a8f2a3aef..c7e4783a53 100644 --- a/tests/integration/tests/4270-files-order/files/stack.yaml +++ b/tests/integration/tests/4270-files-order/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-21.12 +resolver: lts-21.13 packages: - . diff --git a/tests/integration/tests/4453-detailed/files/stack.yaml b/tests/integration/tests/4453-detailed/files/stack.yaml index 3a1ee17704..8acfc658f9 100644 --- a/tests/integration/tests/4453-detailed/files/stack.yaml +++ b/tests/integration/tests/4453-detailed/files/stack.yaml @@ -1,3 +1,3 @@ -resolver: lts-21.12 +resolver: lts-21.13 packages: - '.' diff --git a/tests/integration/tests/4783-doctest-deps/files/snapshot.yaml b/tests/integration/tests/4783-doctest-deps/files/snapshot.yaml index 4d42f6163e..e94b847fc1 100644 --- a/tests/integration/tests/4783-doctest-deps/files/snapshot.yaml +++ b/tests/integration/tests/4783-doctest-deps/files/snapshot.yaml @@ -1,4 +1,4 @@ -resolver: lts-21.12 +resolver: lts-21.13 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 ac8b91b050..93245d9576 100644 --- a/tests/integration/tests/4897-boot-package-pruned/files/stack.yaml +++ b/tests/integration/tests/4897-boot-package-pruned/files/stack.yaml @@ -1,3 +1,3 @@ -resolver: lts-21.12 +resolver: lts-21.13 packages: [.] extra-deps: [./directory] diff --git a/tests/integration/tests/4938-non-ascii-module-names/files/stack.yaml b/tests/integration/tests/4938-non-ascii-module-names/files/stack.yaml index 4c90061b0f..22d0aaa1a2 100644 --- a/tests/integration/tests/4938-non-ascii-module-names/files/stack.yaml +++ b/tests/integration/tests/4938-non-ascii-module-names/files/stack.yaml @@ -1 +1 @@ -resolver: lts-21.12 +resolver: lts-21.13 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 c9140ca081..0fdac44b13 100644 --- a/tests/integration/tests/5180-ghc-rts-flags/files/stack.yaml +++ b/tests/integration/tests/5180-ghc-rts-flags/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-21.12 +resolver: lts-21.13 packages: - . 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 924e437057..e64b058da6 100644 --- a/tests/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml +++ b/tests/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-21.12 +resolver: lts-21.13 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 924e437057..e64b058da6 100644 --- a/tests/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml +++ b/tests/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-21.12 +resolver: lts-21.13 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 a82abfb58a..d91fd6c822 100644 --- a/tests/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml +++ b/tests/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml @@ -1,3 +1,3 @@ -resolver: lts-21.12 +resolver: lts-21.13 packages: - . diff --git a/tests/integration/tests/6046-missing-sublib-unregister/files/stack.yaml b/tests/integration/tests/6046-missing-sublib-unregister/files/stack.yaml index 4c90061b0f..22d0aaa1a2 100644 --- a/tests/integration/tests/6046-missing-sublib-unregister/files/stack.yaml +++ b/tests/integration/tests/6046-missing-sublib-unregister/files/stack.yaml @@ -1 +1 @@ -resolver: lts-21.12 +resolver: lts-21.13 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 48a40374d3..97ff7b67ec 100644 --- a/tests/integration/tests/606-local-version-not-exist/files/stack.yaml +++ b/tests/integration/tests/606-local-version-not-exist/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-21.12 +resolver: lts-21.13 diff --git a/tests/integration/tests/620-env-command/files/run.sh b/tests/integration/tests/620-env-command/files/run.sh index 61ffd86cfb..61b689fe2a 100644 --- a/tests/integration/tests/620-env-command/files/run.sh +++ b/tests/integration/tests/620-env-command/files/run.sh @@ -2,6 +2,6 @@ set -euxo pipefail -stack build --resolver lts-21.12 async -eval `stack config env --resolver lts-21.12` +stack build --resolver lts-21.13 async +eval `stack config env --resolver lts-21.13` ghc Main.hs diff --git a/tests/integration/tests/717-sdist-test/files/stack.yaml b/tests/integration/tests/717-sdist-test/files/stack.yaml index eb046a3844..6ba041e3ac 100644 --- a/tests/integration/tests/717-sdist-test/files/stack.yaml +++ b/tests/integration/tests/717-sdist-test/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-21.12 +resolver: lts-21.13 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 48a40374d3..97ff7b67ec 100644 --- a/tests/integration/tests/763-buildable-false/files/stack.yaml +++ b/tests/integration/tests/763-buildable-false/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-21.12 +resolver: lts-21.13 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 d03d286db7..0a27f6f11f 100644 --- a/tests/integration/tests/allow-newer-specific-packages/files/stack.yaml +++ b/tests/integration/tests/allow-newer-specific-packages/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-21.12 +resolver: lts-21.13 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 f541d43c16..aef7970a2a 100644 --- a/tests/integration/tests/cabal-non-buildable-bug/Main.hs +++ b/tests/integration/tests/cabal-non-buildable-bug/Main.hs @@ -4,7 +4,7 @@ main :: IO () main = do -- Newer Cabal: dry run and building should succeed, because they'll -- both ignore the do-not-build - writeFile "stack.yaml" "resolver: lts-21.12" + writeFile "stack.yaml" "resolver: lts-21.13" 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 faf5ac14a6..4ce4db4059 100644 --- a/tests/integration/tests/cabal-sublibrary-dependency/files/stack.yaml +++ b/tests/integration/tests/cabal-sublibrary-dependency/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-21.12 # GHC 9.4.7 +resolver: lts-21.13 # GHC 9.4.7 packages: - . - subproject diff --git a/tests/integration/tests/drop-packages/files/stack.yaml b/tests/integration/tests/drop-packages/files/stack.yaml index b161e77717..b77f3d8e60 100644 --- a/tests/integration/tests/drop-packages/files/stack.yaml +++ b/tests/integration/tests/drop-packages/files/stack.yaml @@ -1,3 +1,3 @@ -resolver: lts-21.12 +resolver: lts-21.13 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 41eba25e44..53ff0d5a93 100644 --- a/tests/integration/tests/duplicate-package-ids/files/stack1.yaml +++ b/tests/integration/tests/duplicate-package-ids/files/stack1.yaml @@ -1,2 +1,2 @@ -resolver: lts-21.12 +resolver: lts-21.13 packages: [] diff --git a/tests/integration/tests/duplicate-package-ids/files/stack2.yaml b/tests/integration/tests/duplicate-package-ids/files/stack2.yaml index 4ea51703fb..50de4848ed 100644 --- a/tests/integration/tests/duplicate-package-ids/files/stack2.yaml +++ b/tests/integration/tests/duplicate-package-ids/files/stack2.yaml @@ -1,3 +1,3 @@ -resolver: lts-21.12 +resolver: lts-21.13 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 2fa0a3320d..ca22110f56 100644 --- a/tests/integration/tests/haddock-options/files/stack.yaml +++ b/tests/integration/tests/haddock-options/files/stack.yaml @@ -2,7 +2,7 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-21.12 +resolver: lts-21.13 build: haddock-arguments: haddock-args: diff --git a/tests/integration/tests/hpack-repo/files/stack.yaml b/tests/integration/tests/hpack-repo/files/stack.yaml index a613f9c499..fa16079e84 100644 --- a/tests/integration/tests/hpack-repo/files/stack.yaml +++ b/tests/integration/tests/hpack-repo/files/stack.yaml @@ -1,6 +1,6 @@ packages: - . -resolver: lts-21.12 +resolver: lts-21.13 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 bd18d2feea..9fd11cc130 100644 --- a/tests/integration/tests/init-omit-packages/Main.hs +++ b/tests/integration/tests/init-omit-packages/Main.hs @@ -5,8 +5,8 @@ import System.IO (readFile) main :: IO () main = do removeFileIgnore "stack.yaml" - stackErr ["init", "--resolver", "lts-21.12"] - stack ["init", "--resolver", "lts-21.12", "--omit-packages"] + stackErr ["init", "--resolver", "lts-21.13"] + stack ["init", "--resolver", "lts-21.13", "--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 12a6e0f2fa..e745096a2a 100644 --- a/tests/integration/tests/lock-files/files/stack-1-extra +++ b/tests/integration/tests/lock-files/files/stack-1-extra @@ -1,3 +1,3 @@ -resolver: lts-21.12 +resolver: lts-21.13 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 3bb32cffb6..b830fac556 100644 --- a/tests/integration/tests/lock-files/files/stack-2-extras +++ b/tests/integration/tests/lock-files/files/stack-2-extras @@ -1,4 +1,4 @@ -resolver: lts-21.12 +resolver: lts-21.13 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 9a5d65a94e..aadc18162e 100644 --- a/tests/integration/tests/module-added-multiple-times/files/stack.yaml +++ b/tests/integration/tests/module-added-multiple-times/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-21.12 +resolver: lts-21.13 extra-deps: [] flags: {} extra-package-dbs: [] diff --git a/tests/integration/tests/multi-test/files/stack.yaml b/tests/integration/tests/multi-test/files/stack.yaml index 75cc4b868a..5a3e13719a 100644 --- a/tests/integration/tests/multi-test/files/stack.yaml +++ b/tests/integration/tests/multi-test/files/stack.yaml @@ -4,4 +4,4 @@ packages: - sub-package - cyclic extra-deps: [] -resolver: lts-21.12 +resolver: lts-21.13 diff --git a/tests/integration/tests/mutable-deps/files/stack.yaml b/tests/integration/tests/mutable-deps/files/stack.yaml index 385a065507..4928ed4f2e 100644 --- a/tests/integration/tests/mutable-deps/files/stack.yaml +++ b/tests/integration/tests/mutable-deps/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-21.12 +resolver: lts-21.13 packages: - . extra-deps: diff --git a/tests/integration/tests/nice-resolver-names/Main.hs b/tests/integration/tests/nice-resolver-names/Main.hs index 74554c578f..f5f001fd93 100644 --- a/tests/integration/tests/nice-resolver-names/Main.hs +++ b/tests/integration/tests/nice-resolver-names/Main.hs @@ -8,7 +8,7 @@ import Data.List (stripPrefix) main :: IO () main = do - for_ ["lts-20.26", "lts-21.12"] $ \snapshot -> do + for_ ["lts-20.26", "lts-21.13"] $ \snapshot -> do stack ["init", "--force", "--resolver", snapshot] str <- readFile "stack.yaml" case mapMaybe (stripPrefix "resolver: ") $ lines str of diff --git a/tests/integration/tests/upload/files/stack.yaml b/tests/integration/tests/upload/files/stack.yaml index 8602ae934c..346366b855 100644 --- a/tests/integration/tests/upload/files/stack.yaml +++ b/tests/integration/tests/upload/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-21.12 +resolver: lts-21.13 packages: - . diff --git a/tests/integration/tests/watched-files/files/stack.yaml b/tests/integration/tests/watched-files/files/stack.yaml index 4c90061b0f..22d0aaa1a2 100644 --- a/tests/integration/tests/watched-files/files/stack.yaml +++ b/tests/integration/tests/watched-files/files/stack.yaml @@ -1 +1 @@ -resolver: lts-21.12 +resolver: lts-21.13