Merge remote-tracking branch 'upstream/master' into random-test-ghc-env

Author: zyla

.github/ISSUE_TEMPLATE/bug_report.md

@@ -5,7 +5,7 @@ about: Report a bug in Stack
 
 Please follow the steps below for reporting a bug:
 
-Make sure that you are using the latest release (currently stack-2.7.3).
+Make sure that you are using the latest release (currently stack-2.7.5).
 See the [upgrade instructions](http://docs.haskellstack.org/en/stable/install_and_upgrade/#upgrade) to upgrade.
 
 Please use the following schema for your bug report:

.github/ISSUE_TEMPLATE/feature_request.md

@@ -3,7 +3,7 @@ name: Feature Request
 about: Request a feature be added to Stack, or discuss such a feature
 ---
 
-Make sure that you are using the latest release (currently stack-2.7.3).
+Make sure that you are using the latest release (currently stack-2.7.5).
 See the [upgrade instructions](http://docs.haskellstack.org/en/stable/install_and_upgrade/#upgrade) to upgrade.
 
 Please state as clearly as possible what feature you are recommending,

.github/workflows/unit-tests.yml

@@ -47,25 +47,25 @@ jobs:
       matrix:
         include:
         - os: ubuntu-latest
-          stack-yaml: stack-ghc-88.yaml
-          extra-suffix: ""
-          stack-args: ""
-        - os: ubuntu-latest
-          stack-yaml: stack-ghc-810.yaml
-          extra-suffix: ""
-          stack-args: ""
-        - os: ubuntu-latest
-          stack-yaml: stack-nightly.yaml
+          stack-yaml: stack.yaml
           extra-suffix: ""
           stack-args: ""
         - os: ubuntu-latest
           stack-yaml: stack.yaml
           extra-suffix: "alpine"
           stack-args: "--docker --system-ghc --no-install-ghc --flag stack:static"
+        - os: ubuntu-latest
+          stack-yaml: stack-ghc-902.yaml
+          extra-suffix: ""
+          stack-args: ""
         - os: windows-latest
           stack-yaml: stack.yaml
           extra-suffix: ""
           stack-args: ""
+        - os: windows-latest
+          stack-yaml: stack-ghc-902.yaml
+          extra-suffix: ""
+          stack-args: ""
         - os: macos-latest
           stack-yaml: stack.yaml
           extra-suffix: ""

CONTRIBUTING.md

@@ -54,6 +54,17 @@ entry and
 [documentation](https://github.com/commercialhaskell/stack/tree/master/doc/)
 updates with your pull request.
 
+## Backwards Compatability
+
+The `stack` executable does not need to, and does not, strive for the same broad
+compatability with versions of GHC that a library package (such as `pantry`)
+would seek. Instead, the `stack` executable aims to define a well-known
+combination of dependencies on which it relies. That is applies in particular to
+the `Cabal` package, where the `stack` executable aims to support one, and only
+one, version of `Cabal` with each release of the executable. At the time of
+writing (April 2022) that combination is defined by resolver `lts-17.5` (for
+GHC 8.10.4, and including `Cabal-3.2.1.0`) - see `stack.yaml`.
+
 ## Code Quality
 
 The Stack projects uses [HLint](https://github.com/ndmitchell/hlint) as a code

ChangeLog.md

@@ -5,24 +5,57 @@
 
 Release notes:
 
-**Changes since v2.7.3:**
+**Changes since v2.7.5:**
 
 Major changes:
 
 Behavior changes:
 
-* cloning git repositories isn't per sub-directory anymore, see [#5411](https://github.com/commercialhaskell/stack/issues/5411)
+* `stack build --coverage` will generate a unified coverage report, even if
+  there is only one `*.tix` file, in case a package has tested the library of
+  another package that has not tested its own library. See
+  [#5713](https://github.com/commercialhaskell/stack/issues/5713)
+
+Other enhancements:
+
+* Bump to `hpack-0.35.0`.
+* On Windows, the installer now sets `DisplayVersion` in the registry, enabling
+  tools like `winget` to properly read the version number.
+
+Bug fixes:
+
+* Fix `stack clean --full`, so that the files to be deleted are not in use. See
+  [#5714](https://github.com/commercialhaskell/stack/issues/5714)
+* Fix an inconsistency in the pretty formatting of the output of
+  `stack build --coverage`
+
+## v2.7.5
+
+**Changes since v2.7.3:**
+
+Behavior changes:
+
+* Cloning git repositories isn't per sub-directory anymore, see
+  [#5411](https://github.com/commercialhaskell/stack/issues/5411)
 
 Other enhancements:
 
 * `stack setup` supports installing GHC for macOS aarch64 (M1)
 
+* `stack upload` supports authentication with a Hackage API key (via
+  `HACKAGE_KEY` environment variable).
+
 Bug fixes:
 
 * Ensure that `extra-path` works for case-insensitive `PATH`s on Windows.
   See [rio#237](https://github.com/commercialhaskell/rio/pull/237)
 * Fix handling of overwritten `ghc` and `ghc-pkg` locations.
   [#5597](https://github.com/commercialhaskell/stack/pull/5597)
+* Fix failure to find package when a dependency is shared between projects.
+  [#5680](https://github.com/commercialhaskell/stack/issues/5680)
+* `stack ghci` now uses package flags in `stack.yaml`
+  [#5434](https://github.com/commercialhaskell/stack/issues/5434)
+
 
 ## v2.7.3
 
@@ -55,8 +88,6 @@ Bug fixes:
   [GHC issue 20074](https://gitlab.haskell.org/ghc/ghc/-/issues/20074)
 * Track changes to `setup-config` properly to avoid reconfiguring on every change.
   See [#5578](https://github.com/commercialhaskell/stack/issues/5578)
-* `stack ghci` now uses package flags in `stack.yaml`
-  [#5434](https://github.com/commercialhaskell/stack/issues/5434)
 
 
 ## v2.7.1

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015-2021, Stack contributors
+Copyright (c) 2015-2022, Stack contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Setup.hs

@@ -1,4 +1,5 @@
 {-# OPTIONS_GHC -fno-warn-warnings-deprecations #-}
+
 module Main (main) where
 
 import Data.List ( nub, sortBy )