Merge branch 'master' into stack_ghci_config_flags

Author: snoyberg

.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.1).
+Make sure that you are using the latest release (currently stack-2.7.3).
 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.1).
+Make sure that you are using the latest release (currently stack-2.7.3).
 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,

ChangeLog.md

@@ -5,15 +5,25 @@
 
 Release notes:
 
-**Changes since v2.7.1:**
+**Changes since v2.7.3:**
 
 Major changes:
 
 Behavior changes:
 
 Other enhancements:
 
-* `stack upgrade` will download from `haskellstack.org` before trying `github.com`. See
+Bug fixes:
+
+
+## v2.7.3
+
+**Changes since v2.7.1:**
+
+Other enhancements:
+
+* `stack upgrade` will download from `haskellstack.org` before trying
+  `github.com`. See
   [#5288](https://github.com/commercialhaskell/stack/issues/5288)
 * `stack upgrade` makes less assumptions about archive format. See
   [#5288](https://github.com/commercialhaskell/stack/issues/5288)
@@ -30,7 +40,8 @@ Bug fixes:
   [pantry#33](https://github.com/commercialhaskell/pantry/issues/33)
 * When building the sanity check for a new GHC install, make sure to clear
   `GHC_PACKAGE_PATH`.
-* Specifying GHC RTS flags in the `stack.yaml` no longer fails with an error. [#5568](https://github.com/commercialhaskell/stack/pull/5568)
+* Specifying GHC RTS flags in the `stack.yaml` no longer fails with an error.
+  [#5568](https://github.com/commercialhaskell/stack/pull/5568)
 * `stack setup` will look in sandboxed directories for executables, not
   relying on `findExecutables. See
   [GHC issue 20074](https://gitlab.haskell.org/ghc/ghc/-/issues/20074)
@@ -39,6 +50,7 @@ Bug fixes:
 * `stack ghci` now uses package flags in `stack.yaml`
   [#5434](https://github.com/commercialhaskell/stack/issues/5434)
 
+
 ## v2.7.1
 
 **Changes since v2.5.1.1:**

doc/GUIDE.md

@@ -450,7 +450,7 @@ With that out of the way, let's dig a little bit more into these package sets,
 also known as *snapshots*. We mentioned the LTS resolvers, and you can get quite a bit of
 information about it at [https://www.stackage.org/lts](https://www.stackage.org/lts), including:
 
-* The appropriate resolver value (`resolver: lts-17.9`, as is currently the latest LTS)
+* The appropriate resolver value (`resolver: lts-18.3`, as is currently the latest LTS)
 * The GHC version used
 * A full list of all packages available in this snapshot
 * The ability to perform a Hoogle search on the packages in this snapshot
@@ -467,7 +467,7 @@ default as well).
 
 ## Resolvers and changing your compiler version
 
-Let's explore package sets a bit further. Instead of lts-17.9, let's change our
+Let's explore package sets a bit further. Instead of lts-18.3, let's change our
 `stack.yaml` file to use [the latest nightly](https://www.stackage.org/nightly). Right now,
 this is currently 2020-03-24 - please see the resolve from the link above to get the latest.
 
@@ -483,8 +483,8 @@ We can also change resolvers on the command line, which can be useful in a
 Continuous Integration (CI) setting, like on Travis. For example:
 
 ```
-michael@d30748af6d3d:~/helloworld$ stack --resolver lts-17.9 build
-Downloaded lts-17.9 build plan.
+michael@d30748af6d3d:~/helloworld$ stack --resolver lts-18.3 build
+Downloaded lts-18.3 build plan.
 # build output ...
 ```
 
@@ -1143,7 +1143,7 @@ follows the Unix convention of `--` to separate these, e.g.:
 ```
 michael@d30748af6d3d:~$ stack exec --package stm -- echo I installed the stm package via --package stm
 Run from outside a project, using implicit global project config
-Using latest snapshot resolver: lts-17.9
+Using latest snapshot resolver: lts-18.3
 Writing global (non-project-specific) config file to: /home/michael/.stack/global/stack.yaml
 Note: You can change the snapshot via the resolver field there.
 I installed the stm package via --package stm
@@ -1157,6 +1157,10 @@ Flags worth mentioning:
   variable from being set. Some tools — notably cabal-install — do not behave
   well with that variable set.
 
+You may also find it convenient to use `stack exec` to launch a subshell (substitute `bash` with your preferred shell) where your compiled executable is available at the front of your `PATH`:
+
+    stack exec bash
+
 ## ghci (the repl)
 
 GHCi is the interactive GHC environment, a.k.a. the REPL. You *could* access it

doc/build_command.md

@@ -96,8 +96,6 @@ of different syntaxes supported for this list:
       the local packages." This will result in an error if multiple packages
       have a component with the same name. To continue the above example,
       `stack build :mytestsuite`.
-        * Side note: the commonly requested `run` command is not available
-          because it's a simple combination of `stack build :exename && stack exec exename`
 
 * *directory*, e.g. `stack build foo/bar`, will find all local packages that
   exist in the given directory hierarchy and then follow the same procedure as

doc/yaml_configuration.md

@@ -41,7 +41,7 @@ user's local packages, these dependencies aren't built by default. They only get
 built when needed.
 
 Shadowing semantics, described
-[here](http://docs.haskellstack.org/en/stable/architecture/#shadowing), are
+[here](https://docs.haskellstack.org/en/v1.5.1/architecture/#shadowing), are
 applied to your configuration. So, if you add a package to your `packages` list,
 it will be used even if you're using a snapshot that specifies a particular
 version. Similarly, `extra-deps` will shadow the version specified in the

etc/dockerfiles/arm64.Dockerfile

@@ -30,4 +30,4 @@ USER stack
 RUN cd /src && stack build --only-snapshot --test && stack build shake
 
 COPY etc/scripts/release.hs /src
-RUN stack script --resolver lts-17.10 --compile /src/release.hs -- --version && cp /src/release /home/stack
+RUN stack script --resolver lts-17.15 --compile /src/release.hs -- --version && cp /src/release /home/stack

package.yaml

@@ -1,5 +1,5 @@
 name: stack
-version: '2.8.0'
+version: '2.7.4'
 synopsis: The Haskell Tool Stack
 description: |
   Please see the documentation at <https://docs.haskellstack.org>
@@ -104,7 +104,6 @@ dependencies:
 - primitive
 - process
 - project-template
-- regex-applicative-text
 - retry
 - rio >= 0.1.18.0
 - rio-prettyprint >= 0.1.1.0
@@ -326,6 +325,9 @@ tests:
     - raw-strings-qq
     - stack
     - smallcheck
+    verbatim: |
+      build-tool-depends:
+          hspec-discover:hspec-discover
 flags:
   static:
     description: Pass -static/-pthread to ghc when linking the stack binary.

stack.cabal

@@ -1,13 +1,11 @@
 cabal-version: 2.0
 
--- This file has been generated from package.yaml by hpack version 0.33.0.
+-- This file has been generated from package.yaml by hpack version 0.34.4.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: 4d6bc382d1f25fc7283e144b701061b38a5f10879c44997cfdc0b9f3147ce352
 
 name:           stack
-version:        2.8.0
+version:        2.7.4
 synopsis:       The Haskell Tool Stack
 description:    Please see the documentation at <https://docs.haskellstack.org>
                 for usage information.
@@ -284,7 +282,6 @@ library
     , primitive
     , process
     , project-template
-    , regex-applicative-text
     , retry
     , rio >=0.1.18.0
     , rio-prettyprint >=0.1.1.0
@@ -408,7 +405,6 @@ executable stack
     , primitive
     , process
     , project-template
-    , regex-applicative-text
     , retry
     , rio >=0.1.18.0
     , rio-prettyprint >=0.1.1.0
@@ -531,7 +527,6 @@ executable stack-integration-test
     , primitive
     , process
     , project-template
-    , regex-applicative-text
     , retry
     , rio >=0.1.18.0
     , rio-prettyprint >=0.1.1.0
@@ -660,7 +655,6 @@ test-suite stack-test
     , process
     , project-template
     , raw-strings-qq
-    , regex-applicative-text
     , retry
     , rio >=0.1.18.0
     , rio-prettyprint >=0.1.1.0
@@ -702,3 +696,5 @@ test-suite stack-test
   else
     cpp-options: -DSTACK_DEVELOPER_MODE_DEFAULT=False
   default-language: Haskell2010
+  build-tool-depends:
+      hspec-discover:hspec-discover

stack.yaml

@@ -1,4 +1,4 @@
-resolver: lts-17.10
+resolver: lts-17.15
 
 packages:
 - .
@@ -20,9 +20,6 @@ flags:
 ghc-options:
    "$locals": -fhide-source-paths
 
-extra-deps:
-- pantry-0.5.2@rev:0
-
 drop-packages:
 # See https://github.com/commercialhaskell/stack/pull/4712
 - cabal-install