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

ChangeLog.md

@@ -14,7 +14,7 @@ Other enhancements:
 
 Bug fixes:
 
-## v3.3.1 - 2024-12-13
+## v3.3.1 - 2024-12-28
 
 **Changes since v3.1.1:**
 
@@ -55,9 +55,9 @@ Bug fixes:
   as '`stack`' if the executable file is named `stack` or, on Windows,
   `stack.exe`. Previously only how it was invoked was considered.
 * `stack test --no-run-tests --dry-run` no longer reports that Stack would test
-   project packages with test suites and
-   `stack bench --no-run-benchmarks --dry-run` no longer reports that Stack
-   would benchmark project packages with benchmarks.
+  project packages with test suites and
+  `stack bench --no-run-benchmarks --dry-run` no longer reports that Stack
+  would benchmark project packages with benchmarks.
 * `StackSetupShim` compiles with `Cabal >= 3.14.0.0`.
 
 ## v3.1.1 - 2024-07-28

doc/configure/yaml/non-project.md

@@ -1111,7 +1111,7 @@ notify the user if a `nix` executable is on the PATH?
 
 ## notify-if-no-run-benchmarks
 
-:octicons-tag-24: UNRELEASED
+[:octicons-tag-24: 3.3.1](https://github.com/commercialhaskell/stack/releases/tag/v3.3.1)
 
 Default: `true`
 
@@ -1120,7 +1120,7 @@ prevented by the `--no-run-benchmarks` flag?
 
 ## notify-if-no-run-tests
 
-:octicons-tag-24: UNRELEASED
+[:octicons-tag-24: 3.3.1](https://github.com/commercialhaskell/stack/releases/tag/v3.3.1)
 
 Default: `true`
 

doc/configure/yaml/project.md

@@ -39,10 +39,10 @@ installation, and various settings like build flags. It is also called a
 resolver since a snapshot states how dependencies are resolved. There are
 currently four snapshot types:
 
-* LTS Haskell snapshots, e.g. `snapshot: lts-22.21`
-* Stackage Nightly snapshots, e.g. `snapshot: nightly-2024-05-06`
+* LTS Haskell snapshots, e.g. `snapshot: lts-23.0`
+* Stackage Nightly snapshots, e.g. `snapshot: nightly-2024-12-13`
 * No snapshot, just use packages shipped with the compiler. For GHC this looks
-  like `snapshot: ghc-9.6.5`
+  like `snapshot: ghc-9.8.4`
 * Custom snapshot, via a URL or relative file path. For further information, see
   the [snapshot location](../../topics/snapshot_location.md) documentation.
 

doc/tutorial/building_your_project.md

@@ -249,7 +249,7 @@ With that out of the way, let's dig a little bit more into these snapshots. We
 mentioned the LTS snapshots, and you can get information about it at
 [https://www.stackage.org/lts](https://www.stackage.org/lts), including:
 
-* The appropriate value (`lts-22.30`, as is currently the latest LTS)
+* The appropriate value (`lts-23.0`, as is currently the latest LTS)
 * The GHC version used
 * A full list of all packages versions available in this snapshot
 * The ability to perform a Hoogle search on the packages in this snapshot

src/Stack/Init.hs

@@ -432,7 +432,7 @@ renderStackYaml p ignoredPackages dupPackages =
     , "to be used for project dependencies. For example:"
     , ""
     , "snapshot: lts-23.0"
-    , "snapshot: nightly-2024-12-09"
+    , "snapshot: nightly-2024-12-13"
     , "snapshot: ghc-9.8.4"
     , ""
     , "The location of a snapshot can be provided as a file or url. Stack assumes"