Merge pull request #6059 from commercialhaskell/ghc926

Move Stack to lts-20.13 (GHC 9.2.7)

Author: mpilgrem

CONTRIBUTING.md

@@ -285,9 +285,9 @@ compatibility with a range of versions of GHC that a library package (such as
 Stack aims to depend on well-known packages. The specific versions on which it
 depends at any time are specified by `package.yaml` and `stack.yaml`. It does
 not aim to be compatible with more than one version of the `Cabal` package at
-any time. At the time of writing (January 2023) the package versions are
-primarily ones in Stackage snapshot LTS Haskell 20.8 (for GHC 9.2.5), together
-with extra-dep `Cabal-3.8.1.0`.
+any time. At the time of writing (March 2023) the package versions are primarily
+ones in Stackage snapshot LTS Haskell 20.13 (for GHC 9.2.7), together with
+extra-dep `Cabal-3.8.1.0`.
 
 A Stack executable makes use of Cabal (the library) through a small 'Setup'
 executable that it compiles from Haskell source code. The executable compiles

cabal.config

@@ -27,13 +27,13 @@ constraints:
   , base16-bytestring ==1.0.2.0
   , base64-bytestring ==1.2.1.0
   , basement ==0.0.15
-  , bifunctors ==5.5.14
+  , bifunctors ==5.5.15
   , binary ==0.8.9.0
   , blaze-builder ==0.4.2.2
   , blaze-html ==0.9.1.2
   , blaze-markup ==0.8.2.8
   , byteorder ==1.0.4
-  , bytestring ==0.11.3.1
+  , bytestring ==0.11.4.0
   , casa-client ==0.0.1
   , casa-types ==0.0.2
   , case-insensitive ==1.2.1.0
@@ -56,7 +56,7 @@ constraints:
   , data-default-class ==0.1.2.0
   , data-fix ==0.3.2
   , deepseq ==1.4.6.1
-  , digest ==0.0.1.4
+  , digest ==0.0.1.5
   , directory ==1.3.6.2
   , distributive ==0.6.2.1
   , dlist ==1.0
@@ -65,22 +65,22 @@ constraints:
   , ed25519 ==0.0.5.0
   , exceptions ==0.10.4
   , extra ==1.7.12
-  , fast-logger ==3.1.1
+  , fast-logger ==3.1.2
   , file-embed ==0.0.15.0
   , filelock ==0.1.1.5
   , filepath ==1.4.2.2
   , fsnotify ==0.4.1.0
-  , generic-deriving ==1.14.2
+  , generic-deriving ==1.14.3
   , ghc-bignum ==1.2
-  , ghc-boot-th ==9.2.5
+  , ghc-boot-th ==9.2.7
   , ghc-prim ==0.8.0
   , githash ==0.1.6.3
   , hackage-security ==0.6.2.3
   , hashable ==1.4.2.0
   , hi-file-parser ==0.1.3.0
   , hinotify ==0.4.1
   , hourglass ==0.2.12
-  , hpack ==0.35.1
+  , hpack ==0.35.2
   , hpc ==0.6.1.0
   , http-api-data ==0.4.3
   , http-client ==0.7.13.1
@@ -89,7 +89,7 @@ constraints:
   , http-download ==0.2.0.0
   , http-types ==0.12.3
   , indexed-traversable ==0.1.2
-  , indexed-traversable-instances ==0.1.1.1
+  , indexed-traversable-instances ==0.1.1.2
   , infer-license ==0.2.0
   , integer-gmp ==1.1
   , integer-logarithms ==1.0.3.1
@@ -106,7 +106,7 @@ constraints:
   , mime-types ==0.1.0.9
   , mintty ==0.1.4
   , monad-control ==1.0.3.1
-  , monad-logger ==0.3.37
+  , monad-logger ==0.3.39
   , monad-loops ==0.4.3
   , mono-traversable ==1.0.15.3
   , mtl ==2.2.2
@@ -128,7 +128,7 @@ constraints:
   , path-pieces ==0.2.1
   , pem ==0.2.4
   , persistent ==2.14.4.3
-  , persistent-sqlite ==2.13.1.0
+  , persistent-sqlite ==2.13.1.1
   , persistent-template ==2.12.0.0
   , pretty ==1.1.3.6
   , primitive ==0.7.3.0
@@ -168,8 +168,8 @@ constraints:
   , text-short ==0.1.5
   , th-abstraction ==0.4.5.0
   , th-compat ==0.1.4
-  , th-expand-syns ==0.4.10.0
-  , th-lift ==0.8.2
+  , th-expand-syns ==0.4.11.0
+  , th-lift ==0.8.3
   , th-lift-instances ==0.1.20
   , th-reify-many ==0.1.10
   , these ==1.1.1.1
@@ -179,14 +179,14 @@ constraints:
   , transformers ==0.5.6.2
   , transformers-base ==0.4.6
   , transformers-compat ==0.7.2
-  , typed-process ==0.2.10.1
+  , typed-process ==0.2.11.0
   , unicode-data ==0.3.1
   , unicode-transforms ==0.4.0.1
   , unix ==2.7.2.2
   , unix-compat ==0.5.4
   , unix-time ==0.4.8
-  , unliftio ==0.2.23.0
-  , unliftio-core ==0.2.0.1
+  , unliftio ==0.2.24.0
+  , unliftio-core ==0.2.1.0
   , unordered-containers ==0.2.19.1
   , uuid-types ==1.0.5
   , vault ==0.3.1.5
@@ -197,6 +197,6 @@ constraints:
   , x509-store ==1.6.9
   , x509-system ==1.6.7
   , x509-validation ==1.6.12
-  , yaml ==0.11.8.0
+  , yaml ==0.11.11.0
   , zip-archive ==0.4.2.2
   , zlib ==0.6.3.0

cabal.project

@@ -33,8 +33,8 @@
 -- 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-20.8/cabal.config.
+-- https://www.stackage.org/lts-20.13/cabal.config.
 --
-with-compiler: ghc-9.2.5
+with-compiler: ghc-9.2.7
 import: cabal.config
 packages: .

etc/dockerfiles/arm64.Dockerfile

@@ -1,4 +1,4 @@
-# Stack is built with GHC 9.2.5. GHC 9.2.5 for Linux/AArch64 says it was made on
+# Stack is built with GHC 9.2.7. GHC 9.2.7 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
@@ -50,5 +50,5 @@ RUN stack build shake
 
 COPY etc/scripts/release.hs /src
 
-RUN stack script --resolver lts-20.8 --extra-dep Cabal-3.6.3.0 --compile /src/release.hs -- --version
+RUN stack script --resolver lts-20.13 --extra-dep Cabal-3.6.3.0 --compile /src/release.hs -- --version
 RUN cp /src/release /home/stack

etc/scripts/build-stack-installer.hs

@@ -1,5 +1,5 @@
 {- stack script
-    --resolver nightly-2022-11-14
+    --resolver lts-20.13
     --install-ghc
     --package nsis
 -}

etc/scripts/release.hs

@@ -1,5 +1,5 @@
 {- stack script
-    --resolver nightly-2022-11-14
+    --resolver lts-20.13
     --extra-dep Cabal-3.6.3.0
     --extra-dep directory-1.3.6.2
     --ghc-options -Wall

src/Stack/Constants.hs

@@ -224,7 +224,7 @@ wiredInPackages = case mparsed of
     [ "ghc-prim"
       -- A magic package
     , "integer-gmp"
-      -- No longer magic > 1.0.3.0. With GHC 9.2.5 at least, there seems to be
+      -- No longer magic > 1.0.3.0. With GHC 9.2.7 at least, there seems to be
       -- no problem in using it.
     , "integer-simple"
       -- A magic package
@@ -236,16 +236,16 @@ wiredInPackages = case mparsed of
       -- A magic package
     , "dph-seq"
       -- Deprecated in favour of dph-prim-seq, which does not appear to be
-      -- magic. With GHC 9.2.5 at least, there seems to be no problem in using
+      -- magic. With GHC 9.2.7 at least, there seems to be no problem in using
       -- it.
     , "dph-par"
       --  Deprecated in favour of dph-prim-par, which does not appear to be
-      -- magic. With GHC 9.2.5 at least, there seems to be no problem in using
+      -- magic. With GHC 9.2.7 at least, there seems to be no problem in using
       -- it.
     , "ghc"
       -- A magic package
     , "interactive"
-      -- Could not identify information about this package name. With GHC 9.2.5
+      -- Could not identify information about this package name. With GHC 9.2.7
       -- at least, there seems to be no problem in using it.
     , "ghc-bignum"
       -- A magic package

stack.yaml

@@ -1,5 +1,5 @@
-# GHC 9.2.5
-resolver: lts-20.8
+# GHC 9.2.7
+resolver: lts-20.13
 
 packages:
 - .
@@ -9,9 +9,9 @@ extra-deps:
 - 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.8 specifies Cabal-3.6.3.0
+# lts-20.13 specifies Cabal-3.6.3.0
 - Cabal-3.8.1.0@sha256:155d64beeecbae2b19e5d67844532494af88bc8795d4db4146a0c29296f59967,12220
-# lts-20.8 specifies Cabal-syntax-3.6.0.0
+# lts-20.13 specifies Cabal-syntax-3.6.0.0
 - Cabal-syntax-3.8.1.0@sha256:4936765e9a7a8ecbf8fdbe9067f6d972bc0299220063abb2632a9950af64b966,7619
 
 drop-packages:
@@ -20,7 +20,7 @@ drop-packages:
 
 docker:
   enable: false
-  repo: fpco/alpine-haskell-stack:9.2.5
+  repo: fpco/alpine-haskell-stack:9.2.7
 
 nix:
   # --nix on the command-line to enable.

stack.yaml.lock

@@ -48,7 +48,7 @@ packages:
     hackage: Cabal-syntax-3.8.1.0@sha256:4936765e9a7a8ecbf8fdbe9067f6d972bc0299220063abb2632a9950af64b966,7619
 snapshots:
 - completed:
-    sha256: bfafe5735ccb74527d754b1f9999ded72d7c3a6c3a88529449661431ccfbd6cc
-    size: 649327
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/8.yaml
-  original: lts-20.8
+    sha256: b37c0abab16c7de352c45b85f8ecc8530b084209a2c42987a96c92b4a5e3cd65
+    size: 648924
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/13.yaml
+  original: lts-20.13

test/integration/lib/StackTest.hs

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