Merge pull request #6038 from commercialhaskell/lts-20.8

mpilgrem · web-flow · commit a6761427f2a8 · 2023-01-22T14:59:44.000Z
Bump to lts-20.8
diff --git a/etc/dockerfiles/arm64.Dockerfile b/etc/dockerfiles/arm64.Dockerfile
@@ -3,10 +3,12 @@
 # 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.
 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 \
-    libc6-dev libffi-dev libgmp-dev make zlib1g-dev git gnupg netbase
+    libc6-dev libffi-dev libgmp-dev make zlib1g-dev git gnupg netbase pkg-config
 
 RUN cd /tmp && \
     curl -L https://github.com/llvm/llvm-project/releases/download/llvmorg-9.0.1/clang+llvm-9.0.1-aarch64-linux-gnu.tar.xz --output /tmp/llvm.tar.xz && \
@@ -48,5 +50,5 @@ RUN stack build shake
 
 COPY etc/scripts/release.hs /src
 
-RUN stack script --resolver lts-20.0 --extra-dep Cabal-3.6.3.0 --compile /src/release.hs -- --version
+RUN stack script --resolver lts-20.8 --extra-dep Cabal-3.6.3.0 --compile /src/release.hs -- --version
 RUN cp /src/release /home/stack
diff --git a/stack.yaml b/stack.yaml
@@ -1,18 +1,17 @@
 # GHC 9.2.5
-resolver: lts-20.0
+resolver: lts-20.8
 
 packages:
 - .
 
 extra-deps:
 - fsnotify-0.4.1.0@sha256:44540beabea36aeeef930aa4d5f28091d431904bc9923b6ac4d358831c651235,2854
-- hpack-0.35.1@sha256:ef816234cbc7b52b0a6c55f7e904b6bc5292b8dd8f2d81ffcbcbc69ab80d75e5,4762
 - pantry-0.8.1@sha256:196111414d2489499fda6213deebcb865bc12285023d5af9bd273bf27cdb185d,4099
 - persistent-2.14.4.3@sha256:22237669897fed2b71de521bfeba7f8e0677e54992920288ae1fa8206a4711fc,7199
 - rio-prettyprint-0.1.4.0@sha256:1f8eb3ead0ef33d3736d53e1de5e9b2c91a0c207cdca23321bd74c401e85f23a,1301
-# lts-20.0 specifies Cabal-3.6.3.0
+# lts-20.8 specifies Cabal-3.6.3.0
 - Cabal-3.8.1.0@sha256:155d64beeecbae2b19e5d67844532494af88bc8795d4db4146a0c29296f59967,12220
-# lts-20.0 specifies Cabal-syntax-3.6.0.0
+# lts-20.8 specifies Cabal-syntax-3.6.0.0
 - Cabal-syntax-3.8.1.0@sha256:4936765e9a7a8ecbf8fdbe9067f6d972bc0299220063abb2632a9950af64b966,7619
 
 drop-packages:
@@ -30,6 +29,8 @@ nix:
   - unzip
 
 flags:
+  ansi-terminal:
+    win32-2-13-1: false
   hackage-security:
     Cabal-syntax: true
   mintty:
diff --git a/stack.yaml.lock b/stack.yaml.lock
@@ -11,13 +11,6 @@ packages:
       size: 1280
   original:
     hackage: fsnotify-0.4.1.0@sha256:44540beabea36aeeef930aa4d5f28091d431904bc9923b6ac4d358831c651235,2854
-- completed:
-    hackage: hpack-0.35.1@sha256:ef816234cbc7b52b0a6c55f7e904b6bc5292b8dd8f2d81ffcbcbc69ab80d75e5,4762
-    pantry-tree:
-      sha256: 514f0311eff442ab83ef3c2db456857f360ea173c17df133e575f50915e02da0
-      size: 3675
-  original:
-    hackage: hpack-0.35.1@sha256:ef816234cbc7b52b0a6c55f7e904b6bc5292b8dd8f2d81ffcbcbc69ab80d75e5,4762
 - completed:
     hackage: pantry-0.8.1@sha256:196111414d2489499fda6213deebcb865bc12285023d5af9bd273bf27cdb185d,4099
     pantry-tree:
@@ -55,7 +48,7 @@ packages:
     hackage: Cabal-syntax-3.8.1.0@sha256:4936765e9a7a8ecbf8fdbe9067f6d972bc0299220063abb2632a9950af64b966,7619
 snapshots:
 - completed:
-    sha256: a2cbcd2f37010a64c4ef74c21fd7e55982a07b49840d2bed306f9bac9981a9c3
-    size: 648420
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/0.yaml
-  original: lts-20.0
+    sha256: bfafe5735ccb74527d754b1f9999ded72d7c3a6c3a88529449661431ccfbd6cc
+    size: 649327
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/8.yaml
+  original: lts-20.8
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.0
+resolver: lts-20.8
 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.0
+resolver: lts-20.8
 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.0
+resolver: lts-20.8
 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.0
+resolver: lts-20.8
 packages:
 - '.'
 extra-deps: []
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.0
+resolver: lts-20.8
 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.0
+resolver: lts-20.8
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.0
+resolver: lts-20.8
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.0
+resolver: lts-20.8
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.0
+resolver: lts-20.8
 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.0
+resolver: lts-20.8
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.0
+resolver: lts-20.8
 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.0
+resolver: lts-20.8
 
 packages:
 - ./local-mmorph
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.0
+resolver: lts-20.8
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.0
+resolver: lts-20.8
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.0
+resolver: lts-20.8
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.0
+resolver: lts-20.8
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.0
+resolver: lts-20.8
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.0
+resolver: lts-20.8
 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.0
+resolver: lts-20.8
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.0
+resolver: lts-20.8
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.0
+resolver: lts-20.8
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.0
+resolver: lts-20.8
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.0
+resolver: lts-20.8
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.0
+resolver: lts-20.8
 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.0
+resolver: lts-20.8
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.0
+resolver: lts-20.8
 
 packages:
 - .
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.0
+resolver: lts-20.8
 packages:
 - '.'
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.0
+resolver: lts-20.8
 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.0
+resolver: lts-20.8
 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.0
+resolver: lts-20.8
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.0
+resolver: lts-20.8
 packages:
 - .
 
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
@@ -1,4 +1,4 @@
-resolver: lts-20.0
+resolver: lts-20.8
 packages:
 - .
 - ../package-c
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
@@ -1,4 +1,4 @@
-resolver: lts-20.0
+resolver: lts-20.8
 packages:
 - .
 - ../package-c
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
@@ -1,3 +1,3 @@
-resolver: lts-20.0
+resolver: lts-20.8
 packages:
 - .
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
@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-20.0
+resolver: lts-20.8
diff --git a/test/integration/tests/717-sdist-test/files/stack.yaml b/test/integration/tests/717-sdist-test/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-20.0
+resolver: lts-20.8
 packages:
 - package-with-th
 - package-with-working-th
diff --git a/test/integration/tests/763-buildable-false/files/stack.yaml b/test/integration/tests/763-buildable-false/files/stack.yaml
@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-20.0
+resolver: lts-20.8
diff --git a/test/integration/tests/allow-newer-specific-packages/files/stack.yaml b/test/integration/tests/allow-newer-specific-packages/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-20.0
+resolver: lts-20.8
 
 allow-newer: true
 allow-newer-deps:
diff --git a/test/integration/tests/drop-packages/files/stack.yaml b/test/integration/tests/drop-packages/files/stack.yaml
@@ -1,3 +1,3 @@
-resolver: lts-20.0
+resolver: lts-20.8
 drop-packages:
 - unliftio-core
diff --git a/test/integration/tests/duplicate-package-ids/files/stack1.yaml b/test/integration/tests/duplicate-package-ids/files/stack1.yaml
@@ -1,2 +1,2 @@
-resolver: lts-20.0
+resolver: lts-20.8
 packages: []
diff --git a/test/integration/tests/duplicate-package-ids/files/stack2.yaml b/test/integration/tests/duplicate-package-ids/files/stack2.yaml
@@ -1,3 +1,3 @@
-resolver: lts-20.0
+resolver: lts-20.8
 packages:
 - auto-update-0.1.2.1
diff --git a/test/integration/tests/haddock-options/files/stack.yaml b/test/integration/tests/haddock-options/files/stack.yaml
@@ -2,7 +2,7 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-20.0
+resolver: lts-20.8
 build:
   haddock-arguments:
     haddock-args:
diff --git a/test/integration/tests/hpack-repo/files/stack.yaml b/test/integration/tests/hpack-repo/files/stack.yaml
@@ -1,6 +1,6 @@
 packages:
 - .
-resolver: lts-20.0
+resolver: lts-20.8
 extra-deps:
 - git: https://github.com/NorfairKing/validity.git
   commit: d128cc30bc886e31ea7f8161fb7708c08b162937
diff --git a/test/integration/tests/module-added-multiple-times/files/stack.yaml b/test/integration/tests/module-added-multiple-times/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-20.0
+resolver: lts-20.8
 extra-deps: []
 flags: {}
 extra-package-dbs: []
diff --git a/test/integration/tests/multi-test/files/stack.yaml b/test/integration/tests/multi-test/files/stack.yaml
@@ -4,4 +4,4 @@ packages:
 - sub-package
 - cyclic
 extra-deps: []
-resolver: lts-20.0
+resolver: lts-20.8
diff --git a/test/integration/tests/mutable-deps/files/stack.yaml b/test/integration/tests/mutable-deps/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-20.0
+resolver: lts-20.8
 packages:
 - .
 extra-deps:
diff --git a/test/integration/tests/upload/files/stack.yaml b/test/integration/tests/upload/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-20.0
+resolver: lts-20.8
 packages:
 - .
 hackage-base-url: http://localhost:12415/
diff --git a/test/integration/tests/watched-files/files/stack.yaml b/test/integration/tests/watched-files/files/stack.yaml
@@ -1 +1 @@
-resolver: lts-20.0
+resolver: lts-20.8

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-resolver: lts-20.0`
	`1`	`+resolver: lts-20.8`
`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.0`
	`1`	`+resolver: lts-20.8`