Replace ghc-9.2.7->9.4.5 and lts-20.23->nightly-2023-06-18

mpilgrem · mpilgrem · commit bf9300d6b54a · 2023-06-18T13:49:19.000+01:00
Also, update `etc/dockerfiles/arm64.Dockerfile`, `etc/scripts/build-stack-installer.hs` and `etc/scripts/release.hs`.
diff --git a/etc/dockerfiles/arm64.Dockerfile b/etc/dockerfiles/arm64.Dockerfile
@@ -1,10 +1,10 @@
-# Stack is built with GHC 9.2.7. GHC 9.2.7 for Linux/AArch64 says it was made on
+# Stack is built with GHC 9.4.5. GHC 9.4.5 for Linux/AArch64 says it was made on
 # a Debian 10 system and requires GMP 6.1. Debian 10 is codename 'buster' and
 # includes libc6 (2.28-10+deb10u1).
 FROM debian:buster
 
 # pkg-config added to `apt-get install` list because it is required by package
-# digest-0.0.1.4.
+# digest-0.0.1.7.
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y \
     curl build-essential curl libffi-dev libffi6 libgmp-dev libgmp10 \
     libncurses-dev libncurses5 libtinfo5 libnuma-dev xz-utils g++ gcc \
@@ -22,7 +22,7 @@ RUN cd /tmp && \
 
 # Stack's *.tar archive contains a directory that contains the 'stack'
 # executable, hence the use of tar's '--strip-components 1' option.
-RUN curl -L https://github.com/commercialhaskell/stack/releases/download/v2.9.3/stack-2.9.3-linux-aarch64.tar.gz --output /tmp/stack.tar.gz && \
+RUN curl -L https://github.com/commercialhaskell/stack/releases/download/v2.11.1/stack-2.11.1-linux-aarch64.tar.gz --output /tmp/stack.tar.gz && \
     tar xfv /tmp/stack.tar.gz -C /usr/local/bin --strip-components 1 && \
     rm /tmp/stack.tar.gz
 
@@ -54,5 +54,5 @@ RUN stack build shake
 
 COPY etc/scripts/release.hs /src
 
-RUN stack script --resolver lts-20.23 --extra-dep Cabal-3.6.3.0 --compile /src/release.hs -- --version
+RUN stack script --resolver nightly-2023-06-18 --compile /src/release.hs -- --version
 RUN cp /src/release /home/stack
diff --git a/etc/scripts/build-stack-installer.hs b/etc/scripts/build-stack-installer.hs
@@ -1,5 +1,5 @@
 {- stack script
-    --resolver lts-20.23
+    --resolver nightly-2023-06-18
     --install-ghc
     --package nsis
 -}
diff --git a/etc/scripts/release.hs b/etc/scripts/release.hs
@@ -1,17 +1,14 @@
 {- stack script
-   --resolver lts-20.23
-   --extra-dep Cabal-3.6.3.0
-   --extra-dep directory-1.3.6.2
+   --resolver nightly-2023-06-18
    --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.23 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 Nightly 2023-06-18 does not include boot packages
+-- directly.
 
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE RecordWildCards #-}
diff --git a/src/Stack/Init.hs b/src/Stack/Init.hs
@@ -421,8 +421,8 @@ renderStackYaml p ignoredPackages dupPackages =
     , "A snapshot resolver dictates the compiler version and the set of packages"
     , "to be used for project dependencies. For example:"
     , ""
-    , "resolver: lts-20.23"
-    , "resolver: nightly-2023-05-26"
+    , "resolver: lts-20.25"
+    , "resolver: nightly-2023-06-18"
     , "resolver: ghc-9.6.2"
     , ""
     , "The location of a snapshot can be provided as a file or url. Stack assumes"
diff --git a/test/integration/lib/StackTest.hs b/test/integration/lib/StackTest.hs
@@ -351,7 +351,7 @@ isMacOSX = os == "darwin"
 -- the main @stack.yaml@.
 --
 defaultResolverArg :: String
-defaultResolverArg = "--resolver=lts-20.23"
+defaultResolverArg = "--resolver=nightly-2023-06-18"
 
 -- | Remove a file and ignore any warnings about missing files.
 removeFileIgnore :: HasCallStack => FilePath -> IO ()
diff --git a/test/integration/tests/111-custom-snapshot/files/my-snapshot.yaml b/test/integration/tests/111-custom-snapshot/files/my-snapshot.yaml
@@ -1,4 +1,4 @@
-compiler: ghc-9.2.7
+compiler: ghc-9.4.5
 name: my-snapshot
 packages:
 - mtl-2.2.1
diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml b/test/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml
@@ -1,4 +1,4 @@
-resolver: ghc-9.2.7
+resolver: ghc-9.4.5
 name: test-snapshot-2
 packages:
 - stm-2.5.0.0
diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml b/test/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml
@@ -1,4 +1,4 @@
-resolver: lts-20.23
+resolver: nightly-2023-06-18
 name: snapshot-modify-lts
 drop-packages:
 - zlib
diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml b/test/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml
@@ -1,5 +1,5 @@
 ---
-resolver: lts-20.23
+resolver: nightly-2023-06-18
 name: local-snapshot
 packages:
 - archive: package-0.1.2.3.tar.gz
diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml b/test/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml
@@ -1,5 +1,5 @@
 ---
-resolver: lts-20.23
+resolver: nightly-2023-06-18
 name: remote-snapshot
 packages:
 - archive: https://s3.amazonaws.com/hackage.fpcomplete.com/package/ghc-prim-0.8.0.tar.gz
diff --git a/test/integration/tests/1337-unicode-everywhere/files/stack.yaml b/test/integration/tests/1337-unicode-everywhere/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-20.23
+resolver: nightly-2023-06-18
 packages:
 - '.'
 extra-deps: []
diff --git a/test/integration/tests/1438-configure-options/files/stack-everything.yaml b/test/integration/tests/1438-configure-options/files/stack-everything.yaml
@@ -1,4 +1,4 @@
-resolver: ghc-9.2.7
+resolver: ghc-9.4.5
 
 extra-deps:
 - acme-dont-1.1@rev:0
diff --git a/test/integration/tests/1438-configure-options/files/stack-locals.yaml b/test/integration/tests/1438-configure-options/files/stack-locals.yaml
@@ -1,4 +1,4 @@
-resolver: ghc-9.2.7
+resolver: ghc-9.4.5
 
 extra-deps:
 - acme-dont-1.1@rev:0
diff --git a/test/integration/tests/1438-configure-options/files/stack-name.yaml b/test/integration/tests/1438-configure-options/files/stack-name.yaml
@@ -1,4 +1,4 @@
-resolver: ghc-9.2.7
+resolver: ghc-9.4.5
 
 extra-deps:
 - acme-dont-1.1@rev:0
diff --git a/test/integration/tests/1438-configure-options/files/stack-targets.yaml b/test/integration/tests/1438-configure-options/files/stack-targets.yaml
@@ -1,4 +1,4 @@
-resolver: ghc-9.2.7
+resolver: ghc-9.4.5
 
 extra-deps:
 - acme-dont-1.1@rev:0
diff --git a/test/integration/tests/1659-skip-component/files/stack.yaml b/test/integration/tests/1659-skip-component/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-20.23
+resolver: nightly-2023-06-18
 packages:
 - '.'
 extra-deps: []
diff --git a/test/integration/tests/1884-url-to-tarball/files/stack.yaml b/test/integration/tests/1884-url-to-tarball/files/stack.yaml
@@ -2,4 +2,4 @@ extra-deps:
 - location: https://hackage.haskell.org/package/half-0.2.2.3/half-0.2.2.3.tar.gz
   sha256: 85c244c80d1c889a3d79073a6f5a99d9e769dbe3c574ca11d992b2b4f7599a5c
   size: 6050
-resolver: lts-20.23
+resolver: nightly-2023-06-18
diff --git a/test/integration/tests/2195-depend-on-exe/files/stack.yaml b/test/integration/tests/2195-depend-on-exe/files/stack.yaml
@@ -1 +1 @@
-resolver: lts-20.23
+resolver: nightly-2023-06-18
diff --git a/test/integration/tests/2433-ghc-by-version/files/run.sh b/test/integration/tests/2433-ghc-by-version/files/run.sh
@@ -2,10 +2,10 @@
 
 set -exuo pipefail
 
-export PATH=$(pwd)/fake-path:$("$STACK_EXE" path --resolver ghc-9.2.7 --compiler-bin):$PATH
+export PATH=$(pwd)/fake-path:$("$STACK_EXE" path --resolver ghc-9.4.5 --compiler-bin):$PATH
 export STACK_ROOT=$(pwd)/fake-root
 
 which ghc
 
-"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.2.7 ghc -- --info
-"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.2.7 runghc foo.hs
+"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.4.5 ghc -- --info
+"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.4.5 runghc foo.hs
diff --git a/test/integration/tests/2781-shadow-bug/files/stack.yaml b/test/integration/tests/2781-shadow-bug/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: ghc-9.2.7
+resolver: ghc-9.4.5
 packages:
 - foo
 - bar
diff --git a/test/integration/tests/2997-ensure-warnings-output/files/stack.yaml b/test/integration/tests/2997-ensure-warnings-output/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: ghc-9.2.7
+resolver: ghc-9.4.5
 packages:
 - foo
 - bar
diff --git a/test/integration/tests/32-unlisted-module/files/stack.yaml b/test/integration/tests/32-unlisted-module/files/stack.yaml
@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-20.23
+resolver: nightly-2023-06-18
diff --git a/test/integration/tests/3315-multi-ghc-options/files/stack.yaml b/test/integration/tests/3315-multi-ghc-options/files/stack.yaml
@@ -1,3 +1,3 @@
-resolver: lts-20.23
+resolver: nightly-2023-06-18
 packages:
 - '.'
diff --git a/test/integration/tests/335-multi-package-flags/files/stack.yaml b/test/integration/tests/335-multi-package-flags/files/stack.yaml
@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-20.23
+resolver: nightly-2023-06-18
diff --git a/test/integration/tests/3390-unbuildable-test/files/stack.yaml b/test/integration/tests/3390-unbuildable-test/files/stack.yaml
@@ -1 +1 @@
-resolver: ghc-9.2.7
+resolver: ghc-9.4.5
diff --git a/test/integration/tests/3396-package-indices/files/my-snapshot.yaml b/test/integration/tests/3396-package-indices/files/my-snapshot.yaml
@@ -1,4 +1,4 @@
-compiler: ghc-9.2.7
+compiler: ghc-9.4.5
 name: my-snapshot
 
 packages:
diff --git a/test/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml b/test/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml
@@ -1,4 +1,4 @@
-resolver: ghc-9.2.7
+resolver: ghc-9.4.5
 name: custom1
 packages:
 - stm-2.5.0.0
diff --git a/test/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml b/test/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml
@@ -1,4 +1,4 @@
-resolver: ghc-9.2.7
+resolver: ghc-9.4.5
 name: custom2
 packages:
 - stm-2.5.0.0
diff --git a/test/integration/tests/345-override-bytestring/files/stack.yaml b/test/integration/tests/345-override-bytestring/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-20.23
+resolver: nightly-2023-06-18
 extra-deps:
 - bytestring-0.11.3.1
 - binary-0.8.9.0
diff --git a/test/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml b/test/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-20.23
+resolver: nightly-2023-06-18
 
 packages:
 - ./local-mmorph
diff --git a/test/integration/tests/3574-extra-dep-local/files/stack.yaml b/test/integration/tests/3574-extra-dep-local/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: ghc-9.2.7
+resolver: ghc-9.4.5
 
 packages: []
 
diff --git a/test/integration/tests/3591-cabal-warnings-once/files/stack.yaml b/test/integration/tests/3591-cabal-warnings-once/files/stack.yaml
@@ -1 +1 @@
-resolver: lts-20.23
+resolver: nightly-2023-06-18
diff --git a/test/integration/tests/365-invalid-success/files/stack.yaml b/test/integration/tests/365-invalid-success/files/stack.yaml
@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-20.23
+resolver: nightly-2023-06-18
diff --git a/test/integration/tests/366-non-root-dir/files/stack.yaml b/test/integration/tests/366-non-root-dir/files/stack.yaml
@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-20.23
+resolver: nightly-2023-06-18
diff --git a/test/integration/tests/370-invalid-setup-hs/files/stack.yaml b/test/integration/tests/370-invalid-setup-hs/files/stack.yaml
@@ -1 +1 @@
-resolver: ghc-9.2.7
+resolver: ghc-9.4.5
diff --git a/test/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml b/test/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml
@@ -1 +1 @@
-resolver: lts-20.23
+resolver: nightly-2023-06-18
diff --git a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml b/test/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml
@@ -1,4 +1,4 @@
-resolver: ghc-9.2.7
+resolver: ghc-9.4.5
 packages:
 - ./bad-bounds.tar
 
diff --git a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml b/test/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml
@@ -1,4 +1,4 @@
-resolver: ghc-9.2.7
+resolver: ghc-9.4.5
 extra-deps:
 - ./bad-bounds.tar
 
diff --git a/test/integration/tests/3863-purge-command/files/stack.yaml b/test/integration/tests/3863-purge-command/files/stack.yaml
@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-20.23
+resolver: nightly-2023-06-18
diff --git a/test/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml b/test/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: ghc-9.2.7
+resolver: ghc-9.4.5
 extra-deps:
 - stm-2.4.4.1
 - mtl-2.2.1
diff --git a/test/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml b/test/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: ghc-9.2.7
+resolver: ghc-9.4.5
 extra-deps:
 - stm-2.4.4.1
 - mtl-2.2.1
diff --git a/test/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml b/test/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml
@@ -1,3 +1,3 @@
-resolver: lts-20.23
+resolver: nightly-2023-06-18
 extra-deps:
 - base-4.10.1.0
diff --git a/test/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml b/test/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml
@@ -1 +1 @@
-resolver: lts-20.23
+resolver: nightly-2023-06-18
diff --git a/test/integration/tests/3959-order-of-flags/files/stack.yaml b/test/integration/tests/3959-order-of-flags/files/stack.yaml
@@ -1 +1 @@
-resolver: lts-20.23
+resolver: nightly-2023-06-18
diff --git a/test/integration/tests/397-case-insensitive-flags/files/stack.yaml b/test/integration/tests/397-case-insensitive-flags/files/stack.yaml
@@ -1 +1 @@
-resolver: lts-20.23
+resolver: nightly-2023-06-18
diff --git a/test/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml b/test/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: ghc-9.2.7
+resolver: ghc-9.4.5
 extra-deps:
 - stm-2.4.4.1
 - mtl-2.2.1
diff --git a/test/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml b/test/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml
@@ -1 +1 @@
-resolver: lts-20.23
+resolver: nightly-2023-06-18
diff --git a/test/integration/tests/4001-excess-recompilation/files/stack.yaml b/test/integration/tests/4001-excess-recompilation/files/stack.yaml
@@ -1 +1 @@
-resolver: ghc-9.2.7
+resolver: ghc-9.4.5
diff --git a/test/integration/tests/4044-no-run-tests-config/files/stack.yaml b/test/integration/tests/4044-no-run-tests-config/files/stack.yaml
@@ -1,4 +1,4 @@
 build:
   test-arguments:
     no-run-tests: true
-resolver: ghc-9.2.7
+resolver: ghc-9.4.5
diff --git a/test/integration/tests/4095-utf8-pure-nix/files/stack.yaml b/test/integration/tests/4095-utf8-pure-nix/files/stack.yaml
@@ -1 +1 @@
-resolver: lts-20.23
+resolver: nightly-2023-06-18
diff --git a/test/integration/tests/4101-dependency-tree/files/stack.yaml b/test/integration/tests/4101-dependency-tree/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-20.23
+resolver: nightly-2023-06-18
 packages:
 - .
 - subproject
diff --git a/test/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml b/test/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml
@@ -1 +1 @@
-resolver: lts-20.23
+resolver: nightly-2023-06-18
diff --git a/test/integration/tests/4215-missing-unregister/files/stack1.yaml b/test/integration/tests/4215-missing-unregister/files/stack1.yaml
@@ -1,3 +1,3 @@
-resolver: ghc-9.2.7
+resolver: ghc-9.4.5
 packages:
 - v1
diff --git a/test/integration/tests/4215-missing-unregister/files/stack2.yaml b/test/integration/tests/4215-missing-unregister/files/stack2.yaml
@@ -1,3 +1,3 @@
-resolver: ghc-9.2.7
+resolver: ghc-9.4.5
 packages:
 - v2
diff --git a/test/integration/tests/4270-files-order/files/stack.yaml b/test/integration/tests/4270-files-order/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-20.23
+resolver: nightly-2023-06-18
 
 packages:
 - .
diff --git a/test/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml b/test/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml
@@ -1 +1 @@
-resolver: ghc-9.2.7
+resolver: ghc-9.4.5
diff --git a/test/integration/tests/4390-dot-no-ghc/files/stack.yaml b/test/integration/tests/4390-dot-no-ghc/files/stack.yaml
@@ -1 +1 @@
-resolver: ghc-9.2.7
+resolver: ghc-9.4.5
diff --git a/test/integration/tests/4453-detailed/files/stack.yaml b/test/integration/tests/4453-detailed/files/stack.yaml
@@ -1,3 +1,3 @@
-resolver: lts-20.23
+resolver: nightly-2023-06-18
 packages:
 - '.'
diff --git a/test/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml b/test/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml
@@ -1 +1 @@
-resolver: ghc-9.2.7
+resolver: ghc-9.4.5
diff --git a/test/integration/tests/4488-newer-cabal-version/files/stack-good.yaml b/test/integration/tests/4488-newer-cabal-version/files/stack-good.yaml
@@ -1,3 +1,3 @@
-resolver: ghc-9.2.7
+resolver: ghc-9.4.5
 extra-deps:
 - Cabal-2.4.1.0
diff --git a/test/integration/tests/4754-rebuild-haddocks/files/stack.yaml b/test/integration/tests/4754-rebuild-haddocks/files/stack.yaml
@@ -1 +1 @@
-resolver: ghc-9.2.7
+resolver: ghc-9.4.5
diff --git a/test/integration/tests/4783-doctest-deps/files/snapshot.yaml b/test/integration/tests/4783-doctest-deps/files/snapshot.yaml
@@ -1,4 +1,4 @@
-resolver: lts-20.23
+resolver: nightly-2023-06-18
 name: foo
 packages:
 - acme-dont-1.1@sha256:8264ad3e5113d3e0417b46e71d5a9c0914a1f03b5b81319cc329f1dc0f49b96c,602
diff --git a/test/integration/tests/4897-boot-package-pruned/files/stack.yaml b/test/integration/tests/4897-boot-package-pruned/files/stack.yaml
@@ -1,3 +1,3 @@
-resolver: lts-20.23
+resolver: nightly-2023-06-18
 packages: [.]
 extra-deps: [./directory]
diff --git a/test/integration/tests/4938-non-ascii-module-names/files/stack.yaml b/test/integration/tests/4938-non-ascii-module-names/files/stack.yaml
@@ -1 +1 @@
-resolver: lts-20.23
+resolver: nightly-2023-06-18
diff --git a/test/integration/tests/5180-ghc-rts-flags/files/stack.yaml b/test/integration/tests/5180-ghc-rts-flags/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-20.23
+resolver: nightly-2023-06-18
 packages:
 - .
 
diff --git a/test/integration/tests/5272-only-locals/files/stack.yaml b/test/integration/tests/5272-only-locals/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: ghc-9.2.7
+resolver: ghc-9.4.5
 extra-deps:
 - unliftio-core-0.2.0.1@sha256:f9abcdd3f3d28e4840563efb7b8760d2de9b5707bcd6f53a87f6a0d77bb5a9f7,1082
 # Force a unique snapshot
diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml b/test/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml
diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml b/test/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml
diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml b/test/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml
diff --git a/test/integration/tests/6046-missing-sublib-unregister/files/stack.yaml b/test/integration/tests/6046-missing-sublib-unregister/files/stack.yaml
diff --git a/test/integration/tests/606-local-version-not-exist/files/stack.yaml b/test/integration/tests/606-local-version-not-exist/files/stack.yaml
diff --git a/test/integration/tests/617-extra-dep-flag/files/stack.yaml b/test/integration/tests/617-extra-dep-flag/files/stack.yaml
diff --git a/test/integration/tests/617-unused-flag-cli/files/stack.yaml b/test/integration/tests/617-unused-flag-cli/files/stack.yaml
diff --git a/test/integration/tests/617-unused-flag-name-yaml/files/stack.yaml b/test/integration/tests/617-unused-flag-name-yaml/files/stack.yaml
diff --git a/test/integration/tests/617-unused-flag-yaml/files/stack.yaml b/test/integration/tests/617-unused-flag-yaml/files/stack.yaml
diff --git a/test/integration/tests/717-sdist-test/files/stack.yaml b/test/integration/tests/717-sdist-test/files/stack.yaml
diff --git a/test/integration/tests/763-buildable-false/files/stack.yaml b/test/integration/tests/763-buildable-false/files/stack.yaml
diff --git a/test/integration/tests/796-ghc-options/files/stack.yaml b/test/integration/tests/796-ghc-options/files/stack.yaml
diff --git a/test/integration/tests/allow-newer-specific-packages/files/stack.yaml b/test/integration/tests/allow-newer-specific-packages/files/stack.yaml
diff --git a/test/integration/tests/copy-bins-works/files/stack.yaml b/test/integration/tests/copy-bins-works/files/stack.yaml
diff --git a/test/integration/tests/drop-packages/files/stack.yaml b/test/integration/tests/drop-packages/files/stack.yaml
diff --git a/test/integration/tests/duplicate-package-ids/files/stack1.yaml b/test/integration/tests/duplicate-package-ids/files/stack1.yaml
diff --git a/test/integration/tests/duplicate-package-ids/files/stack2.yaml b/test/integration/tests/duplicate-package-ids/files/stack2.yaml
diff --git a/test/integration/tests/ghc-install-hooks/files/run.sh b/test/integration/tests/ghc-install-hooks/files/run.sh
diff --git a/test/integration/tests/haddock-options/files/stack.yaml b/test/integration/tests/haddock-options/files/stack.yaml
diff --git a/test/integration/tests/hpack-repo/files/stack.yaml b/test/integration/tests/hpack-repo/files/stack.yaml
diff --git a/test/integration/tests/init-omit-packages/Main.hs b/test/integration/tests/init-omit-packages/Main.hs
diff --git a/test/integration/tests/module-added-multiple-times/files/stack.yaml b/test/integration/tests/module-added-multiple-times/files/stack.yaml
diff --git a/test/integration/tests/multi-test/files/stack.yaml b/test/integration/tests/multi-test/files/stack.yaml
diff --git a/test/integration/tests/mutable-deps/files/stack.yaml b/test/integration/tests/mutable-deps/files/stack.yaml
diff --git a/test/integration/tests/nice-resolver-names/Main.hs b/test/integration/tests/nice-resolver-names/Main.hs
diff --git a/test/integration/tests/no-rerun-tests/files/stack.yaml b/test/integration/tests/no-rerun-tests/files/stack.yaml
diff --git a/test/integration/tests/override-compiler/files/stack.yaml b/test/integration/tests/override-compiler/files/stack.yaml
diff --git a/test/integration/tests/proper-rebuilds/files/stack.yaml b/test/integration/tests/proper-rebuilds/files/stack.yaml
diff --git a/test/integration/tests/relative-script-snapshots/files/subdir/snapshot.yaml b/test/integration/tests/relative-script-snapshots/files/subdir/snapshot.yaml
diff --git a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-extra-dep.yaml b/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-extra-dep.yaml
diff --git a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/snapshot.yaml b/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/snapshot.yaml
diff --git a/test/integration/tests/upload/files/stack.yaml b/test/integration/tests/upload/files/stack.yaml
diff --git a/test/integration/tests/watched-files/files/stack.yaml b/test/integration/tests/watched-files/files/stack.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-resolver: ghc-9.2.7`
	`1`	`+resolver: ghc-9.4.5`
`2`	`2`	`name: test-snapshot-2`
`3`	`3`	`packages:`
`4`	`4`	`- stm-2.5.0.0`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-resolver: lts-20.23`
	`1`	`+resolver: nightly-2023-06-18`
`2`	`2`	`packages:`
`3`	`3`	`- '.'`
`4`	`4`	`extra-deps: []`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-resolver: lts-20.23`
	`1`	`+resolver: nightly-2023-06-18`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-compiler: ghc-9.2.7`
	`1`	`+compiler: ghc-9.4.5`
`2`	`2`	`name: my-snapshot`
`3`	`3`
`4`	`4`	`packages:`