Merge pull request #6239 from commercialhaskell/ghc-9.4.7

Fix #6238 Move Stack on to GHC 9.4.7

Author: mpilgrem

.devcontainer/devcontainer.json

@@ -3,8 +3,8 @@
   "build": {
     "dockerfile": "GHC.Dockerfile",
     "args": {
-      "GHC_VERSION": "9.4.6",
-      "HLS_VERSION": "2.1.0.0",
+      "GHC_VERSION": "9.4.7",
+      "HLS_VERSION": "2.2.0.0",
       "USE_ZSH_FOR_ROOT": "unset-to-use-ash",
       "SET_LANG": "C.UTF-8",
       "SET_TZ": ""

cabal.config

@@ -80,7 +80,7 @@ constraints:
   , generic-deriving ==1.14.5
   , generically ==0.1.1
   , ghc-bignum ==1.3
-  , ghc-boot-th ==9.4.6
+  , ghc-boot-th ==9.4.7
   , ghc-prim ==0.9.1
   , githash ==0.1.7.0
   , hackage-security ==0.6.2.3

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-21.11/cabal.config.
+-- https://www.stackage.org/lts-21.12/cabal.config.
 --
-with-compiler: ghc-9.4.6
+with-compiler: ghc-9.4.7
 import: cabal.config
 packages: .

doc/GUIDE.md

@@ -255,8 +255,8 @@ 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.11](https://www.stackage.org/lts-21.11), which
-implies GHC 9.4.6 (which is why `stack build` installs that version of GHC if it
+says to use [LTS Haskell 21.12](https://www.stackage.org/lts-21.12), 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.11`, as is currently the
+* The appropriate resolver value (`resolver: lts-21.12`, as is currently the
   latest LTS)
 * The GHC version used
 * A full list of all packages available in this snapshot
@@ -522,7 +522,7 @@ towards by default as well).
 
 ## Resolvers and changing your compiler version
 
-Let's explore package sets a bit further. Instead of `lts-21.11`, let's change
+Let's explore package sets a bit further. Instead of `lts-21.12`, let's change
 our `stack.yaml` file to use the
 [latest nightly](https://www.stackage.org/nightly). Right now, this is currently
 2023-09-09 - please see the resolver from the link above to get the latest.
@@ -1340,7 +1340,7 @@ yields output like:
 
 ~~~text
 Run from outside a project, using implicit global project config
-Using latest snapshot resolver: lts-21.11
+Using latest snapshot resolver: lts-21.12
 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

doc/Stack_and_VS_Code.md

@@ -75,9 +75,9 @@ 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.11`
-(GHC 9.4.6), the command `ghcup install ghc 9.4.6` must have been used to
-install GHC 9.4.6. That may be a minor inconvenience for some people, as one the
+not already installed that version). For example, to use `resolver: lts-21.12`
+(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
 automatically ensures that the necessary version of GHC is available.
 

doc/custom_snapshot.md

@@ -17,7 +17,7 @@ available in snapshots to ensure reproducibility.
     snapshot specification.
 
 ~~~yaml
-resolver: lts-21.11 # Inherits GHC version and package set
+resolver: lts-21.12 # 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.11`, but
-instead use `ghc-9.4.5` instead of `ghc-9.4.6`:
+The following snapshot specification will be identical to `lts-21.12`, but
+instead use `ghc-9.4.5` instead of `ghc-9.4.7`:
 
 ~~~yaml
-resolver: lts-21.11
+resolver: lts-21.12
 compiler: ghc-9.4.5
 ~~~
 
 ### Dropping packages
 
-The following snapshot specification will be identical to `lts-21.11`, but
+The following snapshot specification will be identical to `lts-21.12`, 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.11
+resolver: lts-21.12
 drop-packages:
 - text
 ~~~
 
 ### Hiding packages
 
-The following snapshot specification will be identical to `lts-21.11`, but the
+The following snapshot specification will be identical to `lts-21.12`, 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.11
+resolver: lts-21.12
 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.11`, but
+The following snapshot specification will be identical to `lts-21.12`, but
 provides `-O1` as a ghc-option for `text`:
 
 ~~~yaml
-resolver: lts-21.11
+resolver: lts-21.12
 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.11`, but
+following snapshot specification will be identical to `lts-21.12`, but
 it enables the `developer` Cabal flag:
 
 ~~~yaml
-resolver: lts-21.11
+resolver: lts-21.12
 packages:
 - text-2.0.2
 flags:

doc/dev_containers.md

@@ -34,10 +34,11 @@ provided in the default Dev Container only.
 !!! info
 
     The PATH is
-    `$HOME/.cabal/bin:$HOME/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin`. Consequently, executables installed with Cabal (the tool)
-    (at `$HOME/.cabal/bin`) or Stack or Pip (at `$HOME/.local/bin`) take
-    precedence over the same executable installed at `/usr/local/sbin`,
-    `/usr/local/bin`, etc.
+    `$HOME/.cabal/bin:$HOME/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin`.
+    Consequently, executables installed with Cabal (the tool) (at
+    `$HOME/.cabal/bin`) or Stack or Pip (at `$HOME/.local/bin`) take precedence
+    over the same executable installed at `/usr/local/sbin`, `/usr/local/bin`,
+    etc.
 
 [VS Code](https://code.visualstudio.com) is used as IDE, with the following
 extensions pre‑installed:
@@ -62,15 +63,16 @@ These Docker images are multi-architecture (`linux/amd64`, `linux/arm64/v8`)
 *ghc‑musl* images. They are based on Alpine Linux (that is
 [musl libc](https://musl.libc.org) and [BusyBox](https://www.busybox.net)).
 
-The images contain *unofficial* binary distributions of GHC 9.4.6 and 9.6.2
+The images contain *unofficial* binary distributions of GHC 9.4.7 and 9.6.2
 (that is, ones not released by the GHC developers). That is because:
 
-1.  the official GHC binary distributions for Alpine Linux/x86_64 have known
-    bugs; and
+1.  the official GHC 9.6.2 binary distributions for Alpine Linux/x86_64 have
+    known bugs; and
 2.  there are no official binary distributions for Alpine Linux/AArch64.
 
 Stack's global configuration (`/etc/stack/config.yaml`) sets `system-ghc: true`
-and `install-ghc: false`. That ensures that only the GHC available in the Dev Containers is used.
+and `install-ghc: false`. That ensures that only the GHC available in the Dev
+Containers is used.
 
 ## Usage
 

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.11`, which is from
+the _resolver_. This may be something like `lts-21.12`, 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.11
+resolver: lts-21.12
 packages:
 - .
 extra-deps:
@@ -91,7 +91,7 @@ Add it to the
 directory where your `stack.yaml` file lives, e.g.
 
 ~~~yaml
-resolver: lts-21.11
+resolver: lts-21.12
 packages:
 - .
 extra-deps:

doc/list_command.md

@@ -41,17 +41,17 @@ Package index cache populated
 Error: [S-4926]
 - Could not find package paltry on Hackage. Perhaps you meant: pantry, pretty, pasty, xattr, alloy, para, pappy, alure, polar, factory
 
-stack --resolver lts-21.11 list base unix Win32 acme-missiles pantry
+stack --resolver lts-21.12 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.11 list Win32 pantry
-Win32-2.12.0.1
+stack --resolver lts-21.12 list pantry
 pantry-0.8.3
 
-stack --resolver lts-21.11 list
+stack --resolver lts-21.12 list
 AC-Angle-1.0
 ALUT-2.4.0.3
 ...

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.11 MyScript.hs
+stack script --resolver lts-21.12 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.11 script --package acme-missiles --compile MyScript.hs -- "Don't panic!" "Duck and cover!"
+stack --resolver lts-21.12 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

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.11 --package turtle
+-- stack script --resolver lts-21.12 --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.11 snapshot (`--resolver lts-21.11`) and ensuring the
+LTS Haskell 21.12 snapshot (`--resolver lts-21.12`) 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.11` provides `turtle-1.6.1`).
+snapshot (`lts-21.12` 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.11
+   --resolver lts-21.12
    --
    +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.11 -- MyScript.hs arg1 arg2 +RTS -s -RTS
+stack script --resolver lts-21.12 -- 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.11
+   --resolver lts-21.12
    --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.11
+   --resolver lts-21.12
    --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.11 --package acme-missiles --no-run --compile -- Script.hs`
+`stack script --resolver lts-21.12 --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.11
+  --resolver lts-21.12
   --package base
   --package turtle
   --
@@ -262,7 +262,7 @@ it. Here is an example:
 {- stack
    exec ghci
    --install-ghc
-   --resolver lts-21.11
+   --resolver lts-21.12
    --package turtle
 -}
 ~~~

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
-<https://www.stackage.org/lts-21.11>, you will see a list of 3,010 packages at
-specific version numbers. When you then specify `resolver: lts-21.11`, you're
+<https://www.stackage.org/lts-21.12>, you will see a list of 3,010 packages at
+specific version numbers. When you then specify `resolver: lts-21.12`, you're
 telling Stack to use those package versions in resolving dependencies down to
 specific versions of packages.
 

doc/yaml_configuration.md

@@ -98,7 +98,7 @@ 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.11`
+* LTS Haskell snapshots, e.g. `resolver: lts-21.12`
 * Stackage Nightly snapshots, e.g. `resolver: nightly-2023-09-09`
 * No snapshot, just use packages shipped with the compiler. For GHC this looks
   like `resolver: ghc-9.6.2`
@@ -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.11
+resolver: lts-21.12
 compiler: ghc-9.6.2
 compiler-check: match-exact
 ~~~

etc/scripts/build-stack-installer.hs

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