Merge branch 'master' into rc/v3.1

Author: mpilgrem

ChangeLog.md

@@ -12,6 +12,9 @@ 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
@@ -383,6 +386,11 @@ Behavior changes:
 * On Windows, `stack upgrade` does not offer `sudo` command alternatives if
   attempting to write to the original file name of the running Stack exectuable
   results in a 'Permission' error.
+* On Linux, Stack's `setup` command now distinguishes GHC build
+  `tinfo6-libc6-pre232` from existing `tinfo6`. The former refers to systems
+  where the version of `libc6` (the GNU C Library) is not compatible with
+  version 2.32. `tinfo6-libc6-pre232` is now a possible value for the
+  `ghc-build` configuration option.
 
 Other enhancements:
 

doc/build_command.md

@@ -216,6 +216,21 @@ of the Cabal build process (for further information, see the documentation for
 the [configure-options](yaml_configuration.md#configure-options) configuration
 option).
 
+### `--[no-]allow-newer` flag
+
+:octicons-tag-24: UNRELEASED
+
+Overrides: [`allow-newer`](yaml_configuration.md#allow-newer) non-project
+specific configuration option
+
+Pass the flag to enable or disable the ignoring of lower and upper version
+bounds in Cabal files.
+
+!!! info
+
+    The name `allow-newer` was chosen to match a commonly-used Cabal option
+    which ignored only upper version bounds.
+
 ### `--bench` flag
 
 Pass the flag to add benchmark components to the targets, if specific components

doc/global_flags.md

@@ -183,7 +183,7 @@ it, it is best omitted from the debug output.
 
 ## `--resolver` option
 
-A synonym for the [`--snapshot` option](#snapshot-option) to specify the
+A synonym for the [`--snapshot` option](#-snapshot-option) to specify the
 snapshot resolver.
 
 ## `--[no-]rsl-in-log` flag

doc/setup_command.md

@@ -13,7 +13,7 @@ By default:
 
 * the version of GHC is the one required by the project. Specify the version of
   GHC as an argument to attempt to install a different version of GHC. For
-  example `stack setup 9.4.4` will attempt to install GHC 9.4.4; and
+  example `stack setup 9.6.6` will attempt to install GHC 9.6.6; and
 
 * an attempt to install is made only if the version of GHC is not already
   available to Stack. Pass the flag `--reinstall` (disabled by default) to
@@ -43,15 +43,19 @@ 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.15.1 considers:
+    For example, Stack 2.15.7 considers:
 
     *   If `libc.musl-x86_64.so.1` is present. This file is provided by the
         [musl libc](https://musl.libc.org/).
 
+        [:octicons-tag-24: 2.13.1](https://github.com/commercialhaskell/stack/releases/tag/v2.13.1)
+
     *   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.
 
+        [:octicons-tag-24: 2.11.1](https://github.com/commercialhaskell/stack/releases/tag/v2.11.1)
+
     *   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/).
@@ -63,7 +67,7 @@ command are inconsistent and take no action.
         provided by different versions of a shared low-level terminfo library
         for terminal handling.
 
-    Stack 2.15.1 uses `ghc-build`:
+    Stack 2.15.7 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.
@@ -77,9 +81,14 @@ command are inconsistent and take no action.
     By default, Stack associates:
 
     * the `tinfo6` build with the 'Fedora 33' binary distribution of GHC 9.4.1
-      to 9.4.4. Those binary distributions require versions of `libc6` that are
-      compatible with `libc6` 2.32; and
+      to 9.4.3 and 9.6.1 and later. Those binary distributions require versions
+      of `libc6` that are compatible with `libc6` 2.32;
 
     * the `tinfo6-libc6-pre232` build with the 'Debian 10' binary distribution
-      of GHC 9.4.1 to 9.4.4. Those binary distributions require versions of
-      `libc6` that are compatible with `libc6` 2.28.
+      of GHC 9.4.1 to 9.4.3 and the 'Rocky 8' binary distribution of GHC 9.6.1
+      and later. Those binary distributions require versions of `libc6` that are
+      compatible with `libc6` 2.28; and
+
+    * the `tinfo6` and `tinfo6-libc6-pre232` builds with the 'Fedora 27' binary
+      distribution of GHC 9.4.4 to 9.4.8. Those binary distributions require
+      versions of `libc6` that are compatible with `libc6` 2.26.

doc/yaml_configuration.md

@@ -498,9 +498,15 @@ process.
 
 Default: `false`
 
-Whether to ignore version bounds in Cabal files. This also ignores lower bounds.
-The name `allow-newer` is chosen to match the commonly-used Cabal option.
+Command line equivalent (takes precedence):
+[`stack build --[no-]allow-newer`](build_command.md#-allow-newer-flag) flag
+
+Whether to ignore lower and upper version bounds in Cabal files.
+
+!!! info
 
+    The name `allow-newer` was chosen to match a commonly-used Cabal option
+    which ignored only upper bounds.
 
 ~~~yaml
 allow-newer: true

src/Stack/Build/ConstructPlan.hs

@@ -896,8 +896,11 @@ adrInRange ::
 adrInRange pkgId name range adr = if adrVersion adr `withinRange` range
   then pure True
   else do
-    allowNewer <- view $ configL . to (.allowNewer)
-    allowNewerDeps <- view $ configL . to (.allowNewerDeps)
+    config <- view configL
+    allowNewerCLI <- view $ envConfigL . to (.buildOptsCLI) . to (.allowNewer)
+    let allowNewerConfig = config.allowNewer
+        allowNewer = fromFirst False $ allowNewerCLI <> allowNewerConfig
+        allowNewerDeps = config.allowNewerDeps
     if allowNewer
       then case allowNewerDeps of
         Nothing -> do

src/Stack/Config.hs

@@ -420,7 +420,7 @@ configFromConfigMonoid
           fromFirst AGOLocals configMonoid.applyGhcOptions
         applyProgOptions =
           fromFirst APOLocals configMonoid.applyProgOptions
-        allowNewer = fromFirst False configMonoid.allowNewer
+        allowNewer = configMonoid.allowNewer
         allowNewerDeps = coerce configMonoid.allowNewerDeps
     defaultInitSnapshot <- do
       root <- getCurrentDir

src/Stack/Options/BuildParser.hs

@@ -15,10 +15,12 @@ import           Options.Applicative
                    , metavar, option, strOption, switch, value
                    )
 import           Options.Applicative.Args ( cmdOption )
-import           Options.Applicative.Builder.Extra ( textArgument, textOption )
+import           Options.Applicative.Builder.Extra
+                   ( firstBoolFlagsNoDefault, textArgument, textOption )
 import           Stack.Options.Completion
                    ( flagCompleter, ghcOptsCompleter, targetCompleter )
 import           Stack.Options.PackageParser ( readFlag )
+import           Stack.Options.Utils ( hideMods )
 import           Stack.Prelude
 import           Stack.Types.BuildOptsCLI
                    ( ApplyCLIFlag, BuildCommand, BuildOptsCLI (..)
@@ -61,6 +63,10 @@ buildOptsParser cmd = BuildOptsCLI
       )
   <*> progsOptionsParser
   <*> flagsParser
+  <*> firstBoolFlagsNoDefault
+        "allow-newer"
+        "ignoring of lower and upper version bounds in Cabal files."
+        (hideMods False)
   <*> (   flag' BSOnlyDependencies
             (  long "dependencies-only"
             <> help "A synonym for --only-dependencies."

src/Stack/Types/Build/Exception.hs

@@ -541,7 +541,9 @@ pprintExceptions exceptions configFile stackRoot isImplicitGlobal parentMap want
           then ["also"]
           else
             [ fillSep
-                $  [ "in"
+                $  [ "pass"
+                   , style Shell "--allow-newer" <> ","
+                   , flow "or, in"
                    , pretty (defaultUserConfigPath stackRoot)
                    , flow
                        (  "(global configuration)"

src/Stack/Types/BuildOptsCLI.hs

@@ -19,13 +19,15 @@ import qualified Data.Map.Strict as Map
 import qualified Data.Text as T
 import           Stack.Prelude
 
--- | Build options that may only be specified from the CLI
+-- | Build options that are specified from the CLI and not specified as
+-- non-project specific configuration options under the build key.
 data BuildOptsCLI = BuildOptsCLI
   { targetsCLI :: ![Text]
   , dryrun :: !Bool
   , ghcOptions :: ![Text]
   , progsOptions :: ![(Text, [Text])]
   , flags :: !(Map ApplyCLIFlag (Map FlagName Bool))
+  , allowNewer :: !(First Bool)
   , buildSubset :: !BuildSubset
   , fileWatch :: !FileWatchOpts
   , watchAll :: !Bool
@@ -41,6 +43,7 @@ defaultBuildOptsCLI = BuildOptsCLI
   { targetsCLI = []
   , dryrun = False
   , flags = Map.empty
+  , allowNewer = mempty
   , ghcOptions = []
   , progsOptions = []
   , buildSubset = BSAll