Merge remote-tracking branch 'origin/stable' into rc/v2.3

Author: snoyberg

doc/GUIDE.md

@@ -573,45 +573,6 @@ will work.
 
 (Note: yackage does not currently support hpack, but you can also hpack-convert should you need to generate a package.yaml).
 
-#### External Dependencies
-
-Given that LTS Haskell and Stackage Nightly have ~1400 of the most common
-Haskell packages, this will often be enough to build most packages. However,
-at times, you may find that not all dependencies required may be available in
-the Stackage snapshots.
-
-Let's simulate an unsatisfied dependency by adding acme-missiles to the list of dependencies
-the build requires. This is done by including it in the `Build-depends` section in the .cabal file
-and then re-initing:
-
-```
-cueball:~/yackage-0.8.0$ stack init --force
-# init failure output
-```
-
-stack has tested six different snapshots, and in every case discovered that
-acme-missiles is not available. In the end it suggested that you use the
-`--solver` command line switch if you want to use packages outside Stackage. So
-let's give it a try:
-
-```
-cueball:~/yackage-0.8.0$ stack init --force --solver
-# solver output ...
-```
-
-stack will complain that it needs a `cabal-install` installation. Let's get that:
-
-```
-cueball:~/yackage-0.8.0$ stack install cabal-install
-```
-
-Then run the above `stack init` command again and it will succeed.
-
-As you can verify by viewing `stack.yaml`, three external dependencies were added
-by stack init under the `extra-deps` field. Of course, you could have added the
-external dependencies by manually editing `stack.yaml` but stack init does the
-hard work for you.
-
 #### Excluded Packages
 
 Sometimes multiple packages in your project may have conflicting requirements.
@@ -625,10 +586,10 @@ works.
 To simulate a conflict we will use acme-missiles-0.3 in yackage and we will
 also copy `yackage.cabal` to another directory and change the name of the file
 and package to yackage-test. In this new package we will use acme-missiles-0.2
-instead. Let's see what happens when we run solver:
+instead. Let's see what happens when we re-run stack init:
 
 ```
-cueball:~/yackage-0.8.0$ stack init --force --solver --omit-packages
+cueball:~/yackage-0.8.0$ stack init --force --omit-packages
 # init failure output ...
 ```
 
@@ -696,70 +657,6 @@ Warning: Some packages were found to be incompatible with the resolver and have
 Warning: Specified resolver could not satisfy all dependencies. Some external packages have been added as dependencies.
 You can suppress this message by removing it from stack.yaml
 ```
-### stack solver
-
-While `stack init` is used to create stack configuration file from existing
-cabal files, `stack solver` can be used to fine tune or fix an existing stack
-configuration file.
-
-`stack solver` uses the existing file as a constraint. For example it will
-use only those packages specified in the existing config file or use existing
-external dependencies as constraints to figure out other dependencies.
-
-Let's try `stack solver` to verify the config that we generated earlier with
-`stack init`:
-
-```
-cueball:~/yackage-0.8.0$ stack solver
-# solver output ...
-```
-
-It says there are no changes needed to your configuration. Notice that it also reports
-`example/yackage-test.cabal` as missing from the config. It was purposely
-omitted by `stack init` to resolve a conflict.
-
-Sometimes `stack init` may not be able to give you a perfect configuration. In
-that case, you can tweak the configuration file as per your requirements and then
-run `stack solver`, it will check the file and suggest or apply any fixes
-needed.
-
-For example, if `stack init` ignored certain packages due to name conflicts or
-dependency conflicts, the choice that `stack init` made may not be the correct
-one. In that case you can revert the choice and use solver to fix things.
-
-Let's try commenting out `.` and uncommenting `examples/` in our previously
-generated `stack.yaml` and then run `stack solver`:
-
-```
-cueball:~/yackage-0.8.0$ stack solver
-# solver failure output ...
-```
-
-Due to the change that we made, solver suggested some new dependencies.
-By default it does not make changes to the config. As it suggested you can use
-`--update-config` to make changes to the config.
-
-NOTE: You should probably back up your `stack.yaml` before doing this, such as
-committing to Git/Mercurial/Darcs.
-
-Sometimes, you may want to use specific versions of certain packages for your
-project. To do that you can fix those versions by specifying them in the
-extra-deps section and then use `stack solver` to figure out whether it is
-feasible to use those or what other dependencies are needed as a result.
-
-If you want to change the resolver for your project, you can run
-`stack solver --resolver <resolver name>` and it will figure out the changes needed for you.
-
-Let's see what happens if we change the resolver to an older resolver - lts-2.22:
-
-```
-cueball:~/yackage-0.8.0$ stack solver --resolver lts-2.22
-# solver failure output ...
-```
-
-As you can see, it automatically suggested changes in `extra-deps` due to the
-change of resolver.
-
 ## Different databases
 
 Time to take a short break from hands-on examples and discuss a little
@@ -1741,9 +1638,7 @@ users. Here's a quick rundown:
 
 * `stack update` will download the most recent set of packages from your package
   indices (e.g. Hackage). Generally, stack runs this for you automatically
-  when necessary, but it can be useful to do this manually sometimes (e.g.,
-  before running `stack solver`, to guarantee you have the most recent
-  upstream packages available).
+  when necessary, but it can be useful to do this manually sometimes.
 * `stack unpack` is a command we've already used quite a bit for examples, but
   most users won't use it regularly. It does what you'd expect: downloads a
   tarball and unpacks it. It accept optional `--to` argument to specify

doc/faq.md

@@ -47,8 +47,6 @@ directory. None of this should affect any existing Haskell tools at all.
 * Cabal-the-library is used by stack to build your Haskell code. See the
   [Architecture: Plan Execution](architecture.md#plan-execution) section for
   more detail, including how the Cabal version is chosen.
-* cabal-install (the executable) is used by stack for its dependency solver
-  functionality.
 * A .cabal file is provided for each package, and defines all package-level
   metadata just like it does in the cabal-install world: modules, executables,
   test suites, etc. No change at all on this front.
@@ -76,39 +74,35 @@ extra-deps:
 
 ## I need to use a package (or version of a package) that is not available on hackage, what should I do?
 
-Add it to the `packages` list in your project's `stack.yaml`, specifying the
-package's source code location relative to the directory where your
-`stack.yaml` file lives, e.g.
+Add it to the 
+[`extra-deps`](yaml_configuration.md#extra-deps) list in your project's 
+`stack.yaml`, specifying the package's source code location relative to the 
+directory where your `stack.yaml` file lives, e.g.
 
 ```yaml
 resolver: lts-2.10
 packages:
 - '.'
+extra-deps:
 - third-party/proprietary-dep
 - github-version-of/conduit
 - patched/diagrams
-extra-deps: []
 ```
 
-The above example specifies that it should include the package at the root
-directory (`'.'`), that the `proprietary-dep` package is found in the project's
-`third-party` folder, that the `conduit` package is found in the project's
-`github-version-of` folder, and that the `diagrams` package is found in the
-project's `patched` folder. This autodetects changes and reinstalls the
+The above example specifies that the `proprietary-dep` package is found in the 
+project's `third-party` folder, that the `conduit` package is found in the 
+project's `github-version-of` folder, and that the `diagrams` package is found 
+in the project's `patched` folder. This autodetects changes and reinstalls the
 package.
 
 To install packages directly from a Git repository, use e.g.:
 
 ```yaml
-resolver: lts-2.10
-packages:
-- location:
-    git: https://github.com/githubuser/reponame.git
+extra-deps:
+  - git: https://github.com/githubuser/reponame.git
     commit: somecommitID
 ```
 
-Note that the `- '.'` line has been omitted, so the package in the root directory will not be used.
-
 ## What is the meaning of the arguments given to stack build, test, etc?
 
 Those are the targets of the build, and can have one of three formats:
@@ -129,13 +123,6 @@ your `packages` list in stack.yaml. (See the previous question.)
 Another would be to add the upstream package as a submodule to your
 project.
 
-## Am I required to use a Stackage snapshot to use stack?
-
-No, not at all. If you prefer dependency solving to curation, you can continue
-with that workflow. Instead of describing the details of how that works here,
-it's probably easiest to just say: run `stack init --solver` and look at the
-generated stack.yaml.
-
 ## How do I use this with sandboxes?
 
 Explicit sandboxing on the part of the user is not required by stack. All

doc/maintainers/ghc.md

@@ -40,7 +40,7 @@
 
         cd stack && ./update-global-hints.hs ghc-X.Y.Z
 
-    and command the changes.
+    and commit the changes.
 
 
 ## Building GHC

doc/nonstandard_project_init.md

@@ -18,7 +18,7 @@ general, your stack packages should also end up being valid cabal-install
 packages.
 
 ### Issues Referenced
-  - https://github.com/commercialhaskell/stack/issues/105
+  - <https://github.com/commercialhaskell/stack/issues/105>
 
 ## Passing Flags to Cabal
 
@@ -50,12 +50,12 @@ change in a future release.
 
 
 ### Issues Referenced
-  - https://github.com/commercialhaskell/stack/issues/191
-  - https://github.com/commercialhaskell/stack/issues/417
-  - https://github.com/commercialhaskell/stack/issues/335
-  - https://github.com/commercialhaskell/stack/issues/301
-  - https://github.com/commercialhaskell/stack/issues/365
-  - https://github.com/commercialhaskell/stack/issues/105
+  - <https://github.com/commercialhaskell/stack/issues/191>
+  - <https://github.com/commercialhaskell/stack/issues/417>
+  - <https://github.com/commercialhaskell/stack/issues/335>
+  - <https://github.com/commercialhaskell/stack/issues/301>
+  - <https://github.com/commercialhaskell/stack/issues/365>
+  - <https://github.com/commercialhaskell/stack/issues/105>
 
 ## Selecting a Resolver
 
@@ -75,8 +75,8 @@ default so as to avoid unnecessary recompilation time.
 :TODO: Document `--solver`
 
 ### Issues Referenced
-  - https://github.com/commercialhaskell/stack/issues/468
-  - https://github.com/commercialhaskell/stack/issues/464
+  - <https://github.com/commercialhaskell/stack/issues/468>
+  - <https://github.com/commercialhaskell/stack/issues/464>
 
 ## Using git Repositories
 
@@ -86,8 +86,8 @@ documentation](yaml_configuration.md#git-and-mercurial-repos) for more
 information.
 
 ### Issues Referenced
-  - https://github.com/commercialhaskell/stack/issues/254
-  - https://github.com/commercialhaskell/stack/issues/199
+  - <https://github.com/commercialhaskell/stack/issues/254>
+  - <https://github.com/commercialhaskell/stack/issues/199>
 
 ## Private Hackage
 Working with a private Hackage is currently supported in certain situations.
@@ -105,16 +105,16 @@ eliminating the need to manage a Hackage database and pointless version bumps.
 For further information see [YAML configuration](yaml_configuration.md)
 
 ### Issues Referenced
-  - https://github.com/commercialhaskell/stack/issues/445
-  - https://github.com/commercialhaskell/stack/issues/565
+  - <https://github.com/commercialhaskell/stack/issues/445>
+  - <https://github.com/commercialhaskell/stack/issues/565>
 
 ## Custom Snapshots
 See [Custom Snapshots](custom_snapshot.md).
 
 ### Issues Referenced
-  - https://github.com/commercialhaskell/stack/issues/111
-  - https://github.com/commercialhaskell/stack/issues/253
-  - https://github.com/commercialhaskell/stack/issues/137
+  - <https://github.com/commercialhaskell/stack/issues/111>
+  - <https://github.com/commercialhaskell/stack/issues/253>
+  - <https://github.com/commercialhaskell/stack/issues/137>
 
 ## Intra-package Targets
 Stack supports intra-package targets, similar to `cabal build COMPONENTS` for
@@ -129,4 +129,4 @@ stack test stack:test:stack-integration-test
 Note: this does require prefixing the component name with the package name.
 
 ### Issues referenced
-  - https://github.com/commercialhaskell/stack/issues/201
+  - <https://github.com/commercialhaskell/stack/issues/201>

etc/scripts/get-stack.sh

@@ -72,7 +72,7 @@ post_install_separator() {
 
 # determines the the CPU's instruction set
 get_isa() {
-  if arch | grep -q armv7 ; then
+  if arch | grep -Eq 'armv[78]l?' ; then
     echo arm
   elif arch | grep -q aarch64 ; then
     echo aarch64

etc/scripts/mirror-ghc-bindists-to-github.sh

@@ -20,7 +20,7 @@
 # https://downloads.haskell.org/~ghc/X.Y.Z/.
 #
 
-GHCVER=8.8.3
+GHCVER=8.10.1
 
 if [[ -z "$GITHUB_AUTH_TOKEN" ]]; then
   echo "$0: GITHUB_AUTH_TOKEN environment variable is required" >&2
@@ -42,13 +42,26 @@ mirror_ () {
   destsuffix="$1"; shift
   srcext="$1"; shift
   destext="$1"; shift
+  local srcurl="$base_url/ghc-$GHCVER-${suffix}.tar.${srcext}"
   local srcfn=ghc-$GHCVER-${suffix}${destsuffix:+_}${destsuffix}.tar.${srcext}
   if [[ ! -s "$srcfn.downloaded" ]]; then
     rm -f "$srcfn"
-    curl -Lo "$srcfn" --fail "$base_url/ghc-$GHCVER-${suffix}.tar.${srcext}"
+    curl -Lo "$srcfn" --fail "$srcurl"
     date >"$srcfn.downloaded"
   fi
   local destfn=ghc-$GHCVER-${suffix}${destsuffix:+_}${destsuffix}.tar.${destext}
+  while [[ $# -gt 0 ]]; do
+    alias="$1"
+    echo "    $alias:" >>stack-setup-$GHCVER.yaml
+    echo "        $GHCVER:" >>stack-setup-$GHCVER.yaml
+    echo "            # Mirrored from $srcurl" >>stack-setup-$GHCVER.yaml
+    echo "            url: \"https://github.com/commercialhaskell/ghc/releases/download/ghc-$GHCVER-release/$destfn\"" >>stack-setup-$GHCVER.yaml
+    echo "            content-length: $(stat --printf="%s" "$destfn" 2>/dev/null || stat -f%z "$destfn")" >>stack-setup-$GHCVER.yaml
+    echo "            sha1: $(shasum -a 1 $destfn |cut -d' ' -f1)" >>stack-setup-$GHCVER.yaml
+    echo "            sha256: $(shasum -a 256 $destfn |cut -d' ' -f1)" >>stack-setup-$GHCVER.yaml
+    echo "" >>stack-setup-$GHCVER.yaml
+    shift
+  done
   if [[ ! -s "$destfn.uploaded" ]]; then
     if [[ "${srcext}" == "xz" && "${destext}" == "bz2" ]]; then
       xzcat "$srcfn" | bzip2 -c > "$destfn"
@@ -61,18 +74,6 @@ mirror_ () {
     curl --fail -X POST --data-binary "@$destfn" -H "Content-type: application/octet-stream" -H "Authorization: token $GITHUB_AUTH_TOKEN" "$UPLOAD_URL?name=$destfn"
     date >"$destfn.uploaded"
   fi
-  while [[ $# -gt 0 ]]; do
-    alias="$1"
-    echo "    $alias:" >>stack-setup-$GHCVER.yaml
-    echo "        $GHCVER:" >>stack-setup-$GHCVER.yaml
-    echo "            # Mirrored from $base_url/$srcfn" >>stack-setup-$GHCVER.yaml
-    echo "            url: \"https://github.com/commercialhaskell/ghc/releases/download/ghc-$GHCVER-release/$destfn\"" >>stack-setup-$GHCVER.yaml
-    echo "            content-length: $(stat --printf="%s" "$destfn" 2>/dev/null || stat -f%z "$destfn")" >>stack-setup-$GHCVER.yaml
-    echo "            sha1: $(shasum -a 1 $destfn |cut -d' ' -f1)" >>stack-setup-$GHCVER.yaml
-    echo "            sha256: $(shasum -a 256 $destfn |cut -d' ' -f1)" >>stack-setup-$GHCVER.yaml
-    echo "" >>stack-setup-$GHCVER.yaml
-    shift
-  done
 }
 
 mirror () {
@@ -83,14 +84,15 @@ mirror () {
 # https://github.com/fpco/stackage-content/blob/master/stack/stack-setup-2.yaml
 
 mirror i386-deb9-linux "" xz xz linux32
-mirror x86_64-deb8-linux "" xz xz linux64
+mirror x86_64-deb9-linux "" xz xz linux64
 #mirror x86_64-centos67-linux "" xz xz linux64-gmp4
 mirror x86_64-fedora27-linux "" xz xz linux64-tinfo6
 mirror x86_64-apple-darwin "" xz bz2 macosx
 #mirror i386-unknown-mingw32 "" xz xz windows32
 mirror x86_64-unknown-mingw32 "" xz xz windows64
 #mirror x86_64-portbld-freebsd11 "" xz xz freebsd64-11
 mirror aarch64-deb9-linux "" xz xz linux-aarch64
+mirror armv7-deb9-linux "" xz xz linux-armv7
 
 mirror_ https://github.com/redneb/ghc-alt-libc/releases/download/ghc-$GHCVER-musl i386-unknown-linux-musl "" xz xz linux32-musl
 mirror_ https://github.com/redneb/ghc-alt-libc/releases/download/ghc-$GHCVER-musl x86_64-unknown-linux-musl "" xz xz linux64-musl