Merge remote-tracking branch 'origin/stable'

doc/README.md

@@ -191,3 +191,7 @@ project meeting the needs of Haskell users of all stripes.
 If you'd like to get involved with Stack, check out the
 [newcomer friendly](https://github.com/commercialhaskell/stack/issues?q=is%3Aopen+is%3Aissue+label%3a%22newcomer+friendly%22)
 label on the Github issue tracker.
+
+#### How to uninstall
+Removing ``~/.stack`` and ``/usr/local/bin/stack`` should be sufficient. You may want to delete ``.stack-work`` folders in any Haskell projects that you have built.
+

doc/appveyor.yml

@@ -12,6 +12,10 @@ environment:
   global:
     STACK_ROOT: "c:\\sr"
 
+    # Override the temp directory to avoid sed escaping issues
+    # See https://github.com/haskell/cabal/issues/5386
+    TMP: "c:\\tmp"
+
   matrix:
   - ARGS: ""
   #- ARGS: "--resolver lts-2"
@@ -20,6 +24,7 @@ environment:
   #- ARGS: "--resolver lts-7"
   - ARGS: "--resolver lts-9"
   - ARGS: "--resolver lts-11"
+  - ARGS: "--resolver lts-12"
   #- ARGS: "--resolver nightly"
 
 test_script:
@@ -29,4 +34,4 @@ test_script:
 
 # The ugly echo "" hack is to avoid complaints about 0 being an invalid file
 # descriptor
-- echo "" | stack %ARGS% --no-terminal test --pedantic
+- echo "" | stack %ARGS% --no-terminal test

doc/travis-complex.yml

@@ -100,6 +100,10 @@ matrix:
     compiler: ": #stack 8.2.2"
     addons: {apt: {packages: [libgmp-dev]}}
 
+  - env: BUILD=stack ARGS="--resolver lts-12"
+    compiler: ": #stack 8.4.3"
+    addons: {apt: {packages: [libgmp-dev]}}
+
   # Nightly builds are allowed to fail
   - env: BUILD=stack ARGS="--resolver nightly"
     compiler: ": #stack nightly"
@@ -135,6 +139,10 @@ matrix:
     compiler: ": #stack 8.2.2 osx"
     os: osx
 
+  - env: BUILD=stack ARGS="--resolver lts-12"
+    compiler: ": #stack 8.4.3 osx"
+    os: osx
+
   - env: BUILD=stack ARGS="--resolver nightly"
     compiler: ": #stack nightly osx"
     os: osx
@@ -176,9 +184,14 @@ install:
   case "$BUILD" in
     stack)
       # Add in extra-deps for older snapshots, as necessary
-      stack --no-terminal --install-ghc $ARGS test --bench --dry-run || ( \
-        stack --no-terminal $ARGS build cabal-install && \
-        stack --no-terminal $ARGS solver --update-config)
+      #
+      # This is disabled by default, as relying on the solver like this can
+      # make builds unreliable. Instead, if you have this situation, it's
+      # recommended that you maintain multiple stack-lts-X.yaml files.
+
+      #stack --no-terminal --install-ghc $ARGS test --bench --dry-run || ( \
+      #  stack --no-terminal $ARGS build cabal-install && \
+      #  stack --no-terminal $ARGS solver --update-config)
 
       # Build the dependencies
       stack --no-terminal --install-ghc $ARGS test --bench --only-dependencies

mkdocs.yml

@@ -1,7 +1,8 @@
 site_name: The Haskell Tool Stack
 site_description: The Haskell Tool Stack
 site_author: Stack contributors
-repo_url: https://github.com/commercialhaskell/stack/tree/master/doc
+repo_url: https://github.com/commercialhaskell/stack/
+edit_uri: edit/stable/doc/
 copyright: Copyright (c) 2015-2018, Stack contributors
 docs_dir: doc
 site_dir: _site