From 64cf95a041b21b4e110842cf359a9f0905aeed1f Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Sun, 28 Jul 2024 16:05:49 +0100 Subject: [PATCH] Prepare for final release --- ChangeLog.md | 28 ++++++---------------------- cabal.config | 2 +- package.yaml | 2 +- stack.cabal | 2 +- 4 files changed, 9 insertions(+), 25 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 9cfc69cefa..929662c772 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,27 +1,6 @@ # Changelog -## Unreleased changes - -Release notes: - -**Changes since v3.1.0.1:** - -Major changes: - -Behavior changes: - -Other enhancements: - -* Add flag `--[no-]allow-newer` to Stack's `build` command, which takes - precedence over the existing `allow-newer` configuration option. - -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) +## v3.1.1 2024-07-28 Release notes: @@ -96,6 +75,8 @@ Other enhancements: * In YAML configuration files, the `file-watch-hook` key is introduced to allow `--file-watch` post-processing to be customised with a executable or `sh` shell script. +* Add flag `--[no-]allow-newer` to Stack's `build` command, which takes + precedence over the existing `allow-newer` configuration option. Bug fixes: @@ -112,6 +93,9 @@ Bug fixes: to parse an (otherwise ignored) project-level configuration file. * Stack no longer makes recommendations about a project-level configuration file when only a global configuration file is in use. +* 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. ## v2.15.7 - 2024-05-12 diff --git a/cabal.config b/cabal.config index be1bdf8d03..e40ed80910 100644 --- a/cabal.config +++ b/cabal.config @@ -165,7 +165,7 @@ constraints: , socks ==0.6.1 , split ==0.2.5 , splitmix ==0.1.0.5 - , stack ==3.1.0.2 + , stack ==3.1.1 , static-bytes ==0.1.0 , stm ==2.5.1.0 , stm-chans ==3.0.0.9 diff --git a/package.yaml b/package.yaml index 99ca0dcdb0..7694348699 100644 --- a/package.yaml +++ b/package.yaml @@ -2,7 +2,7 @@ spec-version: 0.35.0 name: stack -version: '3.1.0.2' +version: '3.1.1' synopsis: The Haskell Tool Stack description: | Please see the documentation at diff --git a/stack.cabal b/stack.cabal index 35b8d72978..c8dfbb3ee5 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.1.0.2 +version: 3.1.1 synopsis: The Haskell Tool Stack description: Please see the documentation at for usage information.