Replace ghc-9.2.7->9.4.6 and lts-20.23->lts-21.8

Also, update `etc/dockerfiles/arm64.Dockerfile`, `etc/scripts/build-stack-installer.hs` and `etc/scripts/release.hs`.

Author: mpilgrem

etc/scripts/build-stack-installer.hs

@@ -1,5 +1,5 @@
 {- stack script
-    --resolver lts-20.26
+    --resolver lts-21.8
     --install-ghc
     --package nsis
 -}

etc/scripts/release.hs

@@ -1,17 +1,14 @@
 {- stack script
-   --resolver lts-20.26
-   --extra-dep Cabal-3.6.3.0
-   --extra-dep directory-1.3.6.2
+   --resolver lts-21.8
    --ghc-options -Wall
 -}
 
 -- As no packages are specified in the `stack script` command in the Stack
 -- interpreter options comment, Stack deduces the required packages from the
 -- module imports, being: Cabal, base, bytestring, directory, extra, process,
 -- shake, tar, zip-archive and zlib. These are either GHC boot packages or in
--- the snapshot. However, Stackage LTS 20.26 includes `Win32` directly, which
--- results in `Cabal` and `directory` being 'replaced' on Windows. Consequently,
--- they need to be specified as extra deps.
+-- the snapshot. Stackage LTS Haskell 21.8 does not include boot packages
+-- directly.
 
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE RecordWildCards #-}

src/Stack/Init.hs

@@ -421,8 +421,8 @@ renderStackYaml p ignoredPackages dupPackages =
     , "A snapshot resolver dictates the compiler version and the set of packages"
     , "to be used for project dependencies. For example:"
     , ""
-    , "resolver: lts-20.26"
-    , "resolver: nightly-2023-08-06"
+    , "resolver: lts-21.8"
+    , "resolver: nightly-2023-08-19"
     , "resolver: ghc-9.6.2"
     , ""
     , "The location of a snapshot can be provided as a file or url. Stack assumes"

test/integration/lib/StackTest.hs

@@ -363,7 +363,7 @@ isMacOSX = os == "darwin"
 -- the main @stack.yaml@.
 --
 defaultResolverArg :: String
-defaultResolverArg = "--resolver=lts-20.26"
+defaultResolverArg = "--resolver=lts-21.8"
 
 -- | Remove a file and ignore any warnings about missing files.
 removeFileIgnore :: HasCallStack => FilePath -> IO ()

test/integration/tests/111-custom-snapshot/files/my-snapshot.yaml

@@ -1,4 +1,4 @@
-compiler: ghc-9.2.8
+compiler: ghc-9.4.6
 name: my-snapshot
 packages:
 - mtl-2.2.1

test/integration/tests/1265-extensible-snapshots/Main.hs

@@ -6,5 +6,5 @@ main = do
     stackErr ["build", "zlib-bindings"]
     stack ["build", "--stack-yaml", "stack-modify-lts.yaml", "async"]
     stack ["build", "--stack-yaml", "stack-local-snapshot.yaml", "async"]
-    stack ["build", "--stack-yaml", "stack-remote-snapshot.yaml", "async"]
+    stack ["build", "--stack-yaml", "stack-remote-snapshot.yaml", "acme-missiles"]
     stackErr ["build", "--stack-yaml", "stack-modify-lts.yaml", "zlib-bindings"]

test/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml

@@ -1,9 +1,10 @@
-resolver: ghc-9.2.8
+resolver: ghc-9.4.6
 name: test-snapshot-2
 packages:
-- stm-2.5.0.0
-- async-2.1.0
-- zlib-0.6.2.1@sha256:201b3f7d4edd0a6a0b235105a4d1aa8d30dcb7c8b4043102487407a4753657ef,4508
+- stm-2.5.1.0
+- async-2.2.4
+- hashable-1.4.2.0
+- zlib-0.6.3.0@sha256:9adce39e4ca0b7a87d45df0a243134816c57059a08e28cff5469c98ae1f54dfc,5367
 # FIXME: test these here
 flags: {}
 ghc-options: {}

test/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml

@@ -1,4 +1,4 @@
-resolver: lts-20.26
+resolver: lts-21.8
 name: snapshot-modify-lts
 drop-packages:
 - zlib

test/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml

@@ -1,5 +1,5 @@
 ---
-resolver: lts-20.26
+resolver: lts-21.8
 name: local-snapshot
 packages:
 - archive: package-0.1.2.3.tar.gz

test/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml

@@ -1,5 +1,5 @@
 ---
-resolver: lts-20.26
+resolver: lts-21.8
 name: remote-snapshot
 packages:
-- archive: https://s3.amazonaws.com/hackage.fpcomplete.com/package/ghc-prim-0.8.0.tar.gz
+- archive: https://s3.amazonaws.com/hackage.fpcomplete.com/package/acme-missiles-0.3.tar.gz

test/integration/tests/1337-unicode-everywhere/files/stack.yaml

@@ -1,4 +1,4 @@
-resolver: lts-20.26
+resolver: lts-21.8
 packages:
 - '.'
 extra-deps: []

test/integration/tests/1438-configure-options/files/stack-everything.yaml

@@ -1,4 +1,4 @@
-resolver: ghc-9.2.8
+resolver: ghc-9.4.6
 
 extra-deps:
 - acme-dont-1.1@rev:0

test/integration/tests/1438-configure-options/files/stack-locals.yaml

@@ -1,4 +1,4 @@
-resolver: ghc-9.2.8
+resolver: ghc-9.4.6
 
 extra-deps:
 - acme-dont-1.1@rev:0

test/integration/tests/1438-configure-options/files/stack-name.yaml

@@ -1,4 +1,4 @@
-resolver: ghc-9.2.8
+resolver: ghc-9.4.6
 
 extra-deps:
 - acme-dont-1.1@rev:0

test/integration/tests/1438-configure-options/files/stack-targets.yaml

@@ -1,4 +1,4 @@
-resolver: ghc-9.2.8
+resolver: ghc-9.4.6
 
 extra-deps:
 - acme-dont-1.1@rev:0

test/integration/tests/1659-skip-component/files/stack.yaml

@@ -1,4 +1,4 @@
-resolver: lts-20.26
+resolver: lts-21.8
 packages:
 - '.'
 extra-deps: []

test/integration/tests/1884-url-to-tarball/files/stack.yaml

@@ -2,4 +2,4 @@ extra-deps:
 - location: https://hackage.haskell.org/package/half-0.2.2.3/half-0.2.2.3.tar.gz
   sha256: 85c244c80d1c889a3d79073a6f5a99d9e769dbe3c574ca11d992b2b4f7599a5c
   size: 6050
-resolver: lts-20.26
+resolver: lts-21.8

test/integration/tests/2195-depend-on-exe/files/stack.yaml

@@ -1 +1 @@
-resolver: lts-20.26
+resolver: lts-21.8

test/integration/tests/2433-ghc-by-version/files/run.sh

@@ -2,10 +2,10 @@
 
 set -exuo pipefail
 
-export PATH=$(pwd)/fake-path:$("$STACK_EXE" path --resolver ghc-9.2.8 --compiler-bin):$PATH
+export PATH=$(pwd)/fake-path:$("$STACK_EXE" path --resolver ghc-9.4.6 --compiler-bin):$PATH
 export STACK_ROOT=$(pwd)/fake-root
 
 which ghc
 
-"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.2.8 ghc -- --info
-"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.2.8 runghc foo.hs
+"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.4.6 ghc -- --info
+"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.4.6 runghc foo.hs

test/integration/tests/2781-shadow-bug/files/stack.yaml

@@ -1,4 +1,4 @@
-resolver: ghc-9.2.8
+resolver: ghc-9.4.6
 packages:
 - foo
 - bar

test/integration/tests/2997-ensure-warnings-output/files/stack.yaml

@@ -1,4 +1,4 @@
-resolver: ghc-9.2.8
+resolver: ghc-9.4.6
 packages:
 - foo
 - bar

test/integration/tests/32-unlisted-module/files/stack.yaml

@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-20.26
+resolver: lts-21.8

test/integration/tests/3315-multi-ghc-options/files/stack.yaml

@@ -1,3 +1,3 @@
-resolver: lts-20.26
+resolver: lts-21.8
 packages:
 - '.'

test/integration/tests/335-multi-package-flags/files/stack.yaml

@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-20.26
+resolver: lts-21.8

test/integration/tests/3390-unbuildable-test/files/stack.yaml

@@ -1 +1 @@
-resolver: ghc-9.2.8
+resolver: ghc-9.4.6

test/integration/tests/3396-package-indices/files/my-snapshot.yaml

@@ -1,4 +1,4 @@
-compiler: ghc-9.2.8
+compiler: ghc-9.4.6
 name: my-snapshot
 
 packages:

test/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml

@@ -1,4 +1,4 @@
-resolver: ghc-9.2.8
+resolver: ghc-9.4.6
 name: custom1
 packages:
 - stm-2.5.0.0

test/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml

@@ -1,4 +1,4 @@
-resolver: ghc-9.2.8
+resolver: ghc-9.4.6
 name: custom2
 packages:
 - stm-2.5.0.0

test/integration/tests/345-override-bytestring/files/stack.yaml

@@ -1,4 +1,4 @@
-resolver: lts-20.26
+resolver: lts-21.8
 extra-deps:
 - bytestring-0.11.3.1
 - binary-0.8.9.0

test/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml

@@ -1,4 +1,4 @@
-resolver: lts-20.26
+resolver: lts-21.8
 
 packages:
 - ./local-mmorph

test/integration/tests/3574-extra-dep-local/files/stack.yaml

@@ -1,4 +1,4 @@
-resolver: ghc-9.2.8
+resolver: ghc-9.4.6
 
 packages: []
 

test/integration/tests/3591-cabal-warnings-once/files/stack.yaml

@@ -1 +1 @@
-resolver: lts-20.26
+resolver: lts-21.8

test/integration/tests/365-invalid-success/files/stack.yaml

@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-20.26
+resolver: lts-21.8

test/integration/tests/366-non-root-dir/files/stack.yaml

@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-20.26
+resolver: lts-21.8

test/integration/tests/370-invalid-setup-hs/files/stack.yaml

@@ -1 +1 @@
-resolver: ghc-9.2.8
+resolver: ghc-9.4.6

test/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml

@@ -1 +1 @@
-resolver: lts-20.26
+resolver: lts-21.8

test/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml

@@ -1,4 +1,4 @@
-resolver: ghc-9.2.8
+resolver: ghc-9.4.6
 packages:
 - ./bad-bounds.tar
 

test/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml

@@ -1,4 +1,4 @@
-resolver: ghc-9.2.8
+resolver: ghc-9.4.6
 extra-deps:
 - ./bad-bounds.tar
 

test/integration/tests/3863-purge-command/files/stack.yaml

@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-20.26
+resolver: lts-21.8

test/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml

@@ -1,4 +1,4 @@
-resolver: ghc-9.2.8
+resolver: ghc-9.4.6
 extra-deps:
 - stm-2.4.4.1
 - mtl-2.2.1

test/integration/tests/3926-ghci-with-sublibraries/files/files.cabal

@@ -1,7 +1,8 @@
+cabal-version: 2.0
+
 name:           files
 version:        0.1.0.0
 build-type:     Simple
-cabal-version:  >= 2.0
 
 library
   hs-source-dirs:   src

test/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml

@@ -1,4 +1,4 @@
-resolver: ghc-9.2.8
+resolver: ghc-9.4.6
 extra-deps:
-- stm-2.4.4.1
-- mtl-2.2.1
+- stm-2.5.1.0
+- mtl-2.2.2

test/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml

@@ -1,3 +1,3 @@
-resolver: lts-20.26
+resolver: lts-21.8
 extra-deps:
 - base-4.10.1.0

test/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml

@@ -1 +1 @@
-resolver: lts-20.26
+resolver: lts-21.8

test/integration/tests/3942-solver-error-output/files/test-stack.yml

@@ -1,4 +1,4 @@
-resolver: lts-20.26
+resolver: lts-21.8
 
 packages: []
 

test/integration/tests/3959-order-of-flags/files/stack.yaml

@@ -1 +1 @@
-resolver: lts-20.26
+resolver: lts-21.8

test/integration/tests/397-case-insensitive-flags/files/stack.yaml

@@ -1 +1 @@
-resolver: lts-20.26
+resolver: lts-21.8

test/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml

@@ -1,4 +1,4 @@
-resolver: ghc-9.2.8
+resolver: ghc-9.4.6
 extra-deps:
 - stm-2.4.4.1
 - mtl-2.2.1

test/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml

@@ -1 +1 @@
-resolver: lts-20.26
+resolver: lts-21.8

test/integration/tests/4001-excess-recompilation/files/stack.yaml

@@ -1 +1 @@
-resolver: ghc-9.2.8
+resolver: ghc-9.4.6

test/integration/tests/4044-no-run-tests-config/files/stack.yaml

@@ -1,4 +1,4 @@
 build:
   test-arguments:
     no-run-tests: true
-resolver: ghc-9.2.8
+resolver: ghc-9.4.6

test/integration/tests/4095-utf8-pure-nix/files/stack.yaml

@@ -1 +1,3 @@
-resolver: lts-20.26
+# As of 20 August 2023, there is no Nix package haskell.compiler.ghc946.
+# Available options include ghc926, ghc94, ghc942, ghc943 or ghc944.
+resolver: lts-20.24 # GHC 9.2.7

test/integration/tests/4101-dependency-tree/Main.hs

@@ -12,34 +12,34 @@ main =
   stackCheckStdout ["ls", "dependencies", "tree"] $ \stdOut -> do
     let expected = unlines [ "Packages"
                            , "├─┬ files 0.1.0.0"
-                           , "│ ├─┬ base 4.16.4.0"
+                           , "│ ├─┬ base 4.17.2.0"
                            ]
     unless (expected `isPrefixOf` stdOut) $
       error $ unlines [ "Expected:", expected, "Actual:", stdOut ]
 
   stackCheckStdout ["ls", "dependencies", "tree", "--depth=1"] $ \stdOut -> do
     let expected = unlines [ "Packages"
                            , "├─┬ files 0.1.0.0"
-                           , "│ ├── base 4.16.4.0"
+                           , "│ ├── base 4.17.2.0"
                            , "│ ├── filelock 0.1.1.2"
                            , "│ ├── mtl 2.2.2"
                            , "│ └── subproject 0.1.0.0"
                            , "└─┬ subproject 0.1.0.0"
-                           , "  └── base 4.16.4.0"
+                           , "  └── base 4.17.2.0"
                            ]
     when (stdOut /= expected) $
       error $ unlines [ "Expected:", expected, "Actual:", stdOut ]
 
   stackCheckStdout ["ls", "dependencies", "tree", "subproject"] $ \stdOut -> do
     let expected = unlines [ "Packages"
                            , "└─┬ subproject 0.1.0.0"
-                           , "  └─┬ base 4.16.4.0"
-                           ,"    ├─┬ ghc-bignum 1.2"
-                           ,"    │ └─┬ ghc-prim 0.8.0"
-                           ,"    │   └── rts 1.0.2"
-                           ,"    ├─┬ ghc-prim 0.8.0"
-                           ,"    │ └── rts 1.0.2"
-                           ,"    └── rts 1.0.2"
+                           , "  └─┬ base 4.17.2.0"
+                           , "    ├─┬ ghc-bignum 1.3"
+                           , "    │ └─┬ ghc-prim 0.9.1"
+                           , "    │   └── rts 1.0.2"
+                           , "    ├─┬ ghc-prim 0.9.1"
+                           , "    │ └── rts 1.0.2"
+                           , "    └── rts 1.0.2"
                            ]
     when (stdOut /= expected) $
       error $ unlines [ "Expected:", expected, "Actual:", stdOut ]

test/integration/tests/4101-dependency-tree/files/stack.yaml

@@ -1,4 +1,4 @@
-resolver: lts-20.26
+resolver: lts-21.8
 packages:
 - .
 - subproject

test/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml

@@ -1 +1 @@
-resolver: lts-20.26
+resolver: lts-21.8

test/integration/tests/4215-missing-unregister/files/stack1.yaml

@@ -1,3 +1,3 @@
-resolver: ghc-9.2.8
+resolver: ghc-9.4.6
 packages:
 - v1

test/integration/tests/4215-missing-unregister/files/stack2.yaml

@@ -1,3 +1,3 @@
-resolver: ghc-9.2.8
+resolver: ghc-9.4.6
 packages:
 - v2

test/integration/tests/4270-files-order/files/stack.yaml

@@ -1,4 +1,4 @@
-resolver: lts-20.26
+resolver: lts-21.8
 
 packages:
 - .