Merge branch 'rc/v3.11' into ci/merge-stable-to-master

Author: mpilgrem

ChangeLog.md

@@ -8,27 +8,26 @@ Release notes:
 
 Major changes:
 
-* On 64-bit Windows, the default `msys-environment` configuration option is now
-  `CLANG64`, rather than `MINGW64` (which remains an option). The MSYS2 project
-  deprecated the latter environment on 15 March 2026. The GHC project has used
-  the former toolchain from GHC 9.4.1. No default is provided for 32-bit
-  Windows, rather than `MINGW32` (which remains an option). The MSYS2 project
-  ceased to actively support it on 17 May 2020. 32-bit Windows is not supported
-  by the GHC project from GHC 8.12.
-
 Behavior changes:
 
 Other enhancements:
 
 Bug fixes:
 
-* On Windows, Stack's `build` command now accepts a build directory that is a
-  long path.
-
-##  v3.11.1 - 2026-05-30
+##  v3.11.1 - 2026-06-13
 
 **Changes since v3.9.3:**
 
+Major changes:
+
+* On 64-bit Windows, the default `msys-environment` configuration option is now
+  `CLANG64`, rather than `MINGW64` (which remains an option). The MSYS2 project
+  deprecated the latter environment on 15 March 2026. The GHC project has used
+  the former toolchain from GHC 9.4.1. No default is provided for 32-bit
+  Windows, rather than `MINGW32` (which remains an option). The MSYS2 project
+  ceased to actively support it on 17 May 2020. 32-bit Windows is not supported
+  by the GHC project from GHC 8.12.
+
 Behavior changes:
 
 * Stack's default Nix integration now includes the `cacert` Nix package, in
@@ -44,7 +43,7 @@ Behavior changes:
 
 Other enhancements:
 
-* Bump to Hpack 0.39.5.
+* Bump to Hpack 0.39.6.
 * Experimental: Add flag `--[no-]semaphore` (default: disabled) to Stack's
   `build` command, to allow GHC to use a system semaphore to perform compilation
   in parallel when possible. Supported, by default, by GHC 9.10.1 or later. The
@@ -92,6 +91,8 @@ Bug fixes:
   of Stack's local install root directory.
 * Stack now builds packages that depend directly on packages with the same name
   as a sublibrary or foreign library of the package.
+* On Windows, Stack's `build` command now accepts a build directory that is a
+  long path.
 
 ## v3.9.3 - 2026-02-19
 

cabal.config

@@ -102,7 +102,7 @@ constraints:
   , haskell-src-exts ==1.23.1
   , haskell-src-meta ==0.8.15
   , hi-file-parser ==0.1.8.0
-  , hpack ==0.39.5
+  , hpack ==0.39.6
   , hpc ==0.7.0.2
   , hpke ==0.0.0
   , http-api-data ==0.6.3

doc/commands/build_command.md

@@ -950,7 +950,7 @@ the [`stack path --local-install-root`](path_command.md) command.
 
 :octicons-beaker-24: Experimental
 
-:octicons-tag-24: UNRELEASED
+[:octicons-tag-24: 3.11.1](https://github.com/commercialhaskell/stack/releases/tag/v3.11.1)
 
 Default: Disabled
 

doc/commands/config_command.md

@@ -37,7 +37,7 @@ without taking any other build steps.
 
 ## The `stack config compiler-tools` command
 
-:octicons-tag-24: UNRELEASED
+[:octicons-tag-24: 3.11.1](https://github.com/commercialhaskell/stack/releases/tag/v3.11.1)
 
 ~~~text
 stack config compiler-tools

doc/configure/yaml/non-project.md

@@ -165,7 +165,7 @@ Default:
 
 ~~~yaml
 build:
-  # Experimental. Since Stack UNRELEASED. Supported by GHC 9.8.1 or later with
+  # Experimental. Since Stack 3.11.1. Supported by GHC 9.8.1 or later with
   # Cabal 3.12.0.0 (a boot package of GHC 9.10.1) or later. Ignored with a
   # warning when unsupported.
   semaphore: false
@@ -1603,7 +1603,8 @@ Customize the URLs where Stack looks for information about available snapshots,
 either
 ([:octicons-tag-24: 1.1.0](https://github.com/commercialhaskell/stack/releases/tag/v1.1.0))
 the latest LTS and Nightly snapshots (`latest-snapshots`) or
-(:octicons-tag-24: UNRELEASED) recently-published snapshots (`recent-snapshots`).
+([:octicons-tag-24: 3.11.1](https://github.com/commercialhaskell/stack/releases/tag/v3.11.1))
+recently-published snapshots (`recent-snapshots`).
 
 !!! note
 

stack.cabal

@@ -17,7 +17,7 @@ extra-deps:
 # lts-24.43 specifies crypton-x509-validation-1.6.14
 - crypton-x509-validation-1.8.0@sha256:63acb2df06f28c3ffdddaf6d9402105b9026796036aa10d7347ae4f7db51c36b,2018
 # lts-24.43 specifies hpack-0.38.3
-- hpack-0.39.5@sha256:c214f49ed3df75ce75201709927fa27e08f642023ed4b4ca8cc43604e5199ced,5263
+- hpack-0.39.6@sha256:3dcd46245401aec2239ff63680880f04817635c7df00ee8ebe2bea9b57393891,5263
 # lts-24.43 specifies pantry-0.10.1
 - pantry-0.11.2@sha256:bc14e75f512deb22e0d9d645e62eb63b319d1732bfed6509491601215ecbd307,7896
 # lts-24.43 specifies persistent-2.17.1.0

stack.yaml

@@ -68,12 +68,12 @@ packages:
   original:
     hackage: crypton-x509-validation-1.8.0@sha256:63acb2df06f28c3ffdddaf6d9402105b9026796036aa10d7347ae4f7db51c36b,2018
 - completed:
-    hackage: hpack-0.39.5@sha256:c214f49ed3df75ce75201709927fa27e08f642023ed4b4ca8cc43604e5199ced,5263
+    hackage: hpack-0.39.6@sha256:3dcd46245401aec2239ff63680880f04817635c7df00ee8ebe2bea9b57393891,5263
     pantry-tree:
-      sha256: 75fe87db5a37bf3941e29e2273f530ee7b2932d64bf813b55151a889e97305ca
+      sha256: c8839695b53b682930d9a359357d1c6b7ded84a1e16d5b75ab7c77c99c3561f8
       size: 3799
   original:
-    hackage: hpack-0.39.5@sha256:c214f49ed3df75ce75201709927fa27e08f642023ed4b4ca8cc43604e5199ced,5263
+    hackage: hpack-0.39.6@sha256:3dcd46245401aec2239ff63680880f04817635c7df00ee8ebe2bea9b57393891,5263
 - completed:
     hackage: pantry-0.11.2@sha256:bc14e75f512deb22e0d9d645e62eb63b319d1732bfed6509491601215ecbd307,7896
     pantry-tree: