Merge branch 'rc/v2.13' into list-stdout

Author: mpilgrem

ChangeLog.md

@@ -4,17 +4,22 @@
 
 Release notes:
 
-**Changes since v2.13.1:**
+**Changes since v2.13.0.1:**
 
 Major changes:
 
 Behavior changes:
 
+* `stack list` outputs to standard output rather than to standard error.
+
 Other enhancements:
 
 Bug fixes:
 
-## v2.13.1
+* Restore message suffix `due to warnings` with `dump-logs: warning` (broken
+  with Stack 2.11.1).
+
+## v2.13.0.1 (release candidate) - 2023-09-16
 
 Release notes:
 

cabal.config

@@ -163,7 +163,7 @@ constraints:
   , socks ==0.6.1
   , split ==0.2.3.5
   , splitmix ==0.1.0.4
-  , stack ==2.14.0
+  , stack ==2.13.0.1
   , static-bytes ==0.1.0
   , stm ==2.5.1.0
   , stm-chans ==3.0.0.9

doc/build_command.md

@@ -585,7 +585,7 @@ This can be useful with `stack build --dry-run`.
 
 ### `--progress-bar` option
 
-:octicons-tag-24: UNRELEASED
+[:octicons-tag-24: 2.13.1](https://github.com/commercialhaskell/stack/releases/tag/v2.13.1)
 
 Default: `capped`
 

doc/global_flags.md

@@ -162,7 +162,7 @@ to standard output (e.g. `2.9.1`) and quit.
 
 ## `--[no-]plan-in-log` flag
 
-:octicons-tag-24: UNRELEASED
+[:octicons-tag-24: 2.13.1](https://github.com/commercialhaskell/stack/releases/tag/v2.13.1)
 
 Default: Disabled
 

doc/setup_command.md

@@ -43,25 +43,30 @@ command are inconsistent and take no action.
     required on Linux, Stack will refer to the presence or absence of certain
     libraries or the versions of those libraries.
 
-    For example, Stack 2.11.1 considers:
+    For example, Stack 2.13.1 considers:
 
-    *   the version of `libc6`, the
+    *   If `libc.musl-x86_64.so.1` is present. This file is provided by the
+        [musl libc](https://musl.libc.org/).
+
+    *   The version of `libc6` (if musl libc is not applicable), the
         [GNU C Library](https://www.gnu.org/software/libc/) (glibc), that is
         present. The GNU C Library is designed to be backwards compatible.
 
-    *   if `libgmp.so.3` or `libgmp.so.10` is present. These files are provided
+    *   If `libgmp.so.3` or `libgmp.so.10` is present. These files are provided
         by different versions of the
         [GNU Multiple Precision Arithmetic Library](https://gmplib.org/).
 
-    *   if `libncursesw.so.6` is present. This file is provided by a shared
+    *   If `libncursesw.so.6` is present. This file is provided by a shared
         library for terminal handling with wide character support.
 
-    *   if `libtinfo.so.5` or `libtinfo.so.6` is present. These files are
+    *   If `libtinfo.so.5` or `libtinfo.so.6` is present. These files are
         provided by different versions of a shared low-level terminfo library
         for terminal handling.
 
-    Stack 2.11.1 uses `ghc-build`:
+    Stack 2.13.1 uses `ghc-build`:
 
+    * `musl` to indicate `libc.musl-x86_64.so.1` is present and Stack should use
+       the GHC binary distribution for Alpine Linux.
     * `tinfo6` to indicate `libgmp.so.10` and `libtinfo.so.6` are present and
       `libc6` is compatible with `libc6` 2.32.
     * `tinfo6-libc6-pre232` to indicate `libgmp.so.10` and `libtinfo.so.6` are

doc/upgrade_command.md

@@ -79,7 +79,7 @@ When compiling from source code, by default:
   `my-stack upgrade --no-only-local-bin` seeks also to upgrade `my-stack` to the
   latest version of Stack available.
 
-* `stack upgrade --binary-version 2.11.1` seeks an upgrade to Stack 2.11.1 if
+* `stack upgrade --binary-version 2.13.1` seeks an upgrade to Stack 2.13.1 if
   available as a binary distribution for the platform, even if not newer.
 
 * `stack upgrade --source-only` seeks an upgrade by building Stack with

doc/yaml_configuration.md

@@ -463,7 +463,7 @@ build:
 
   # Since 1.8. Starting with 2.0, the default is true
   interleaved-output: true
-  # Since UNRELEASED. Available options are none, count-only, capped and full.
+  # Since 2.13.1. Available options are none, count-only, capped and full.
   progress-bar: capped
   # Since 1.10.
   ddump-dir: ""
@@ -480,7 +480,7 @@ of the same name. For further information, see the
 
 ### casa
 
-:octicons-tag-24: UNRELEASED
+[:octicons-tag-24: 2.13.1](https://github.com/commercialhaskell/stack/releases/tag/v2.13.1)
 
 Default:
 
@@ -1366,7 +1366,7 @@ setup-info:
 
 'Platforms' are pairs of an operating system and a machine architecture (for
 example, 32-bit i386 or 64-bit x86-64) (represented by the
-`Cabal.Distribution.Systems.Platform` type). Stack currently (version 2.11.1)
+`Cabal.Distribution.Systems.Platform` type). Stack currently (version 2.13.1)
 supports the following pairs in the format of the `setup-info` key:
 
 |Operating system|I386 arch|X86_64 arch|Other machine architectures                                 |

package.yaml

@@ -2,7 +2,7 @@
 spec-version: 0.35.0
 
 name: stack
-version: '2.14.0'
+version: '2.13.0.2'
 synopsis: The Haskell Tool Stack
 description: |
   Please see the documentation at <https://docs.haskellstack.org>

src/Stack/Build/ConstructPlan.hs

@@ -10,6 +10,7 @@ module Stack.Build.ConstructPlan
 
 import           Control.Monad.RWS.Strict
                    ( RWST, get, modify, modify', pass, put, runRWST, tell )
+import           Control.Monad.Trans.Maybe ( MaybeT (..) )
 import qualified Data.List as L
 import qualified Data.Map.Merge.Strict as Map
 import qualified Data.Map.Strict as Map
@@ -1206,18 +1207,28 @@ psLocation PSRemote{} = Snap
 -- tool dependencies.
 checkAndWarnForUnknownTools :: Package -> M ()
 checkAndWarnForUnknownTools p = do
-  -- Check whether the tool is on the PATH before warning about it.
-  warnings <- fmap catMaybes $ forM (Set.toList $ packageUnknownTools p) $
-    \name@(ExeName toolName) -> do
-      let settings = minimalEnvSettings { esIncludeLocals = True }
-      config <- view configL
-      menv <- liftIO $ configProcessContextSettings config settings
-      mfound <- runRIO menv $ findExecutable $ T.unpack toolName
-      case mfound of
-        Left _ -> pure $ Just $ ToolWarning name (packageName p)
-        Right _ -> pure Nothing
+  let unknownTools = Set.toList $ packageUnknownTools p
+  -- Check whether the tool is on the PATH or a package executable before
+  -- warning about it.
+  warnings <-
+    fmap catMaybes $ forM unknownTools $ \name@(ExeName toolName) ->
+      runMaybeT $ notOnPath toolName *> notPackageExe toolName *> warn name
   tell mempty { wWarnings = (map toolWarningText warnings ++) }
   pure ()
+ where
+  -- From Cabal 2.0, build-tools can specify a pre-built executable that should
+  -- already be on the PATH.
+  notOnPath toolName = MaybeT $ do
+    let settings = minimalEnvSettings { esIncludeLocals = True }
+    config <- view configL
+    menv <- liftIO $ configProcessContextSettings config settings
+    eFound <- runRIO menv $ findExecutable $ T.unpack toolName
+    skipIf $ isRight eFound
+  -- From Cabal 1.12, build-tools can specify another executable in the same
+  -- package.
+  notPackageExe toolName = MaybeT $ skipIf $ toolName `Set.member` packageExes p
+  warn name = MaybeT . pure . Just $ ToolWarning name (packageName p)
+  skipIf p' = pure $ if p' then Nothing else Just ()
 
 -- | Warn about tools in the snapshot definition. States the tool name
 -- expected and the package name using it.

src/Stack/Build/Execute.hs

@@ -578,7 +578,7 @@ withExecuteEnv bopts boptsCli baseConfigOpts locals globalPackages snapshotPacka
          fillSep
            ( ( fillSep
                  ( flow "Dumping log file"
-                 : [ flow msgSuffix | L.null msgSuffix ]
+                 : [ flow msgSuffix | not (L.null msgSuffix) ]
                  )
              <> ":"
              )