From de2899f68a8f2563573b1ba6732b4c7b53385adf Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Fri, 13 Dec 2024 18:56:52 +0000 Subject: [PATCH] Release preparation, Step D --- ChangeLog.md | 6 +----- cabal.config | 2 +- doc/configure/yaml/non-project.md | 4 ++-- doc/configure/yaml/project.md | 6 +++--- doc/tutorial/building_your_project.md | 2 +- package.yaml | 2 +- src/Stack/Init.hs | 2 +- stack.cabal | 2 +- 8 files changed, 11 insertions(+), 15 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 241f32bf59..59dd446d4a 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,13 +1,9 @@ # Changelog -## Unreleased changes - -Release notes: +## v3.3.0.1 (release candidate) - 2024-12-13 **Changes since v3.1.1:** -Major changes: - Behavior changes: * Stack interprets consecutive line ends in the value of the `user-message` diff --git a/cabal.config b/cabal.config index 647def5b8f..27bca977d2 100644 --- a/cabal.config +++ b/cabal.config @@ -169,7 +169,7 @@ constraints: , socks ==0.6.1 , split ==0.2.5 , splitmix ==0.1.0.5 - , stack ==3.2.0 + , stack ==3.3.0.1 , static-bytes ==0.1.1 , stm ==2.5.3.1 , stm-chans ==3.0.0.9 diff --git a/doc/configure/yaml/non-project.md b/doc/configure/yaml/non-project.md index 4e757c0d5e..fd8cc67902 100644 --- a/doc/configure/yaml/non-project.md +++ b/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` diff --git a/doc/configure/yaml/project.md b/doc/configure/yaml/project.md index b613c4318d..aa391ab6ea 100644 --- a/doc/configure/yaml/project.md +++ b/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. diff --git a/doc/tutorial/building_your_project.md b/doc/tutorial/building_your_project.md index 63b8acee3d..5e1d635400 100644 --- a/doc/tutorial/building_your_project.md +++ b/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 diff --git a/package.yaml b/package.yaml index 2c24fc3560..2410296718 100644 --- a/package.yaml +++ b/package.yaml @@ -2,7 +2,7 @@ spec-version: 0.35.0 name: stack -version: '3.3.0' +version: '3.3.0.1' synopsis: The Haskell Tool Stack description: | Please see the documentation at diff --git a/src/Stack/Init.hs b/src/Stack/Init.hs index 96f2c51c47..5aa35f9941 100644 --- a/src/Stack/Init.hs +++ b/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" diff --git a/stack.cabal b/stack.cabal index 94ccbd1b5f..52e543911b 100644 --- a/stack.cabal +++ b/stack.cabal @@ -5,7 +5,7 @@ cabal-version: 2.0 -- see: https://github.com/sol/hpack name: stack -version: 3.3.0 +version: 3.3.0.1 synopsis: The Haskell Tool Stack description: Please see the documentation at for usage information.