Merge branch 'master' into rc/v3.1

Author: mpilgrem

.devcontainer/devcontainer.json

@@ -3,16 +3,16 @@
   "build": {
     "dockerfile": "GHC.Dockerfile",
     "args": {
-      "GHC_VERSION": "9.6.5",
-      "HLS_VERSION": "2.8.0.0",
+      "GHC_VERSION": "9.6.6",
+      "HLS_VERSION": "2.9.0.1",
       "USE_ZSH_FOR_ROOT": "unset-to-use-ash",
       "SET_LANG": "C.UTF-8",
       "SET_TZ": ""
     }
   },
 
   "onCreateCommand": "onCreateCommand.sh",
-  "postCreateCommand": "cabal update",
+  "postCreateCommand": "postCreateCommand.sh",
 
   "features": {
     "ghcr.io/devcontainers/features/common-utils:2": {

.devcontainer/ghc-9.10.1/devcontainer.json

@@ -12,7 +12,7 @@
   },
 
   "onCreateCommand": "onCreateCommand.sh",
-  "postCreateCommand": "cabal update",
+  "postCreateCommand": "postCreateCommand.sh",
 
   "features": {
     "ghcr.io/devcontainers/features/common-utils:2": {

.devcontainer/ghc-9.8.2/devcontainer.json

@@ -12,7 +12,7 @@
   },
 
   "onCreateCommand": "onCreateCommand.sh",
-  "postCreateCommand": "cabal update",
+  "postCreateCommand": "postCreateCommand.sh",
 
   "features": {
     "ghcr.io/devcontainers/features/common-utils:2": {

.devcontainer/scripts/usr/local/bin/postCreateCommand.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+# Copyright (c) 2023 b-data GmbH.
+# Distributed under the terms of the MIT License.
+
+set -e
+
+# Change ownership of the stack folder
+sudo chown "$(id -u)":"$(id -g)" /workspaces/stack
+
+# Updates list of known packages
+cabal update

.github/workflows/integration-tests.yml

@@ -203,7 +203,7 @@ jobs:
       run: |
         set -ex
 
-        # As of 19 August 2023, the self-hosted runner comes with Stack 2.11.1,
+        # As of 11 July 2024, the self-hosted runner comes with Stack 2.15.7,
         # but it is not on the PATH. Logging the version for information.
         /usr/local/bin/stack --version
 
@@ -214,7 +214,7 @@ jobs:
       run: |
         # Stack's project-level configuration (stack.yaml) specifies the
         # multi-architecture (including Linux/Aarch64) Docker image published by
-        # Oliver Benz (@benz0li, on GitHub). That image comes with Stack 2.11.1.
+        # Oliver Benz (@benz0li, on GitHub). That image comes with Stack 2.15.7.
         # (Note that the online documentation for '--docker-stack-exe image'
         # specifies that the host Stack and image Stack must have the same
         # version number.)

CONTRIBUTING.md

@@ -342,8 +342,8 @@ 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 (May 2024) the package versions are primarily
-ones in Stackage snapshot LTS Haskell 22.21 (for GHC 9.6.5), together with
-extra-deps to depend on the latest version of `pantry` and `tar`.
+ones in Stackage snapshot LTS Haskell 22.28 (for GHC 9.6.6), together with
+extra-deps to depend on the latest version of `hpack`, `pantry` and `tar`.
 
 A Stack executable makes use of Cabal (the library) through a small 'Setup'
 executable that it compiles from Haskell source code. The executable compiles
@@ -663,7 +663,7 @@ for each file.
 
 [Stan](https://hackage.haskell.org/package/stan) is a Haskell static analysis
 tool. As of `stan-0.1.0.1`, it supports GHC >= 9.6.3 and Stack is built with
-GHC 9.6.5. The tool is configured by the contents of the `.stan.toml` file.
+GHC 9.6.6. The tool is configured by the contents of the `.stan.toml` file.
 
 This workflow will run if:
 

ChangeLog.md

@@ -14,6 +14,10 @@ Other enhancements:
 
 Bug fixes:
 
+* Fix a regression, introduced in Stack 2.15.7, that caused GHC 8.10.7 or
+  earlier to fail to build a package with a `Custom` build type, if GHC option
+  `-haddock` was specified.
+
 ## v3.1.0.1 (release candidate)
 
 Release notes:

cabal.config

@@ -80,8 +80,8 @@ constraints:
   , generic-deriving ==1.14.5
   , generically ==0.1.1
   , ghc-bignum ==1.3
-  , ghc-boot ==9.6.5
-  , ghc-boot-th ==9.6.5
+  , ghc-boot ==9.6.6
+  , ghc-boot-th ==9.6.6
   , ghc-prim ==0.10.0
   , githash ==0.1.7.0
   , hackage-security ==0.6.2.4

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-22.21/cabal.config.
+-- https://www.stackage.org/lts-22.28/cabal.config.
 --
-with-compiler: ghc-9.6.5
+with-compiler: ghc-9.6.6
 import: cabal.config
 packages: .

doc/GUIDE.md

@@ -258,7 +258,7 @@ packages:
 The value of the [`resolver`](yaml_configuration.md#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 22.21](https://www.stackage.org/lts-22.21), which implies GHC 9.6.5
+[LTS Haskell 22.28](https://www.stackage.org/lts-22.28), which implies GHC 9.6.6
 (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.
@@ -982,7 +982,7 @@ stack purge
 stack build :helloworld-test
 helloworld> configure (lib + test)
 Configuring helloworld-0.1.0.0...
-helloworld> build (lib + test) with ghc-9.6.5
+helloworld> build (lib + test) with ghc-9.6.6
 Preprocessing library for helloworld-0.1.0.0..
 Building library for helloworld-0.1.0.0..
 [1 of 2] Compiling Lib
@@ -1300,7 +1300,7 @@ yields output like:
 
 ~~~text
 Run from outside a project, using implicit global project config
-Using latest snapshot resolver: lts-22.21
+Using latest snapshot resolver: lts-22.28
 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