Merge branch 'prerelease/v1.6.0.20171017'

Author: borsboom

CONTRIBUTING.md

@@ -44,9 +44,9 @@ discuss the change before plowing into writing code.
 
 If you'd like to help out but aren't sure what to work on, look for issues with
 the
-[awaiting pr](https://github.com/commercialhaskell/stack/issues?q=is%3Aopen+is%3Aissue+label%3A%22awaiting+pr%22)
+[awaiting pull request](https://github.com/commercialhaskell/stack/issues?q=is%3Aopen+is%3Aissue+label%3A%22awaiting+pull+request%22)
 label. Issues that are suitable for newcomers to the codebase have the
-[newcomer](https://github.com/commercialhaskell/stack/issues?q=is%3Aopen+is%3Aissue+label%3A%22awaiting+pr%22+label%3Anewcomer)
+[newcomer friendly](https://github.com/commercialhaskell/stack/issues?q=is%3Aopen+is%3Aissue+label%3A%22awaiting+pull+request%22+label%3a%22newcomer+friendly%22)
 label. Best to post a comment to the issue before you start work, in case anyone
 has already started.
 

doc/GUIDE.md

@@ -2169,7 +2169,7 @@ but adds the `+RTS -xc` runtime option.
 
 `stack` now supports debugging and profiling with
 [DWARF information](https://ghc.haskell.org/trac/ghc/wiki/DWARF),
-using the `--no-strip`, `--no-library-stripping`, and `--no-executable-shipping`
+using the `--no-strip`, `--no-library-stripping`, and `--no-executable-stripping`
 flags to disable the default behavior of removing such information from compiled
 libraries and executables.
 

doc/README.md

@@ -55,7 +55,7 @@ the needed files to start a project correctly.
 - The `stack build` command will build the minimal project.
 - `stack exec my-project-exe` will execute the command.
 - If you just want to install an executable using stack, then all you have to do
-is`stack install <package-name>`.
+is `stack install <package-name>`.
 
 If you want to launch a REPL:
 
@@ -118,7 +118,10 @@ installed.
 4. Once `stack` finishes building, check the stack version with
    `stack exec stack -- --version`. Make sure the version is the latest.
 5. Look for issues tagged with
-   [`newcomer` and `awaiting-pr` labels](https://github.com/commercialhaskell/stack/issues?q=is%3Aopen+is%3Aissue+label%3Anewcomer+label%3A%22awaiting+pr%22).
+   [newcomer friendly](https://github.com/commercialhaskell/stack/issues?q=is%3Aopen+is%3Aissue+label%3a%22newcomer+friendly%22)
+   and
+   [awaiting pull request](https://github.com/commercialhaskell/stack/issues?q=is%3Aopen+is%3Aissue+label%3A%22awaiting+pull+request%22)
+   labels.
 
 Build from source as a one-liner:
 
@@ -175,4 +178,4 @@ commercial Haskell users, and has since become a thriving open source
 project meeting the needs of Haskell users of all stripes.
 
 If you'd like to get involved with Stack, check out the
-[newcomers label on the Github issue tracker](https://github.com/commercialhaskell/stack/issues?q=is%3Aopen+is%3Aissue+label%3Anewcomer).
+[newcomer friendly](https://github.com/commercialhaskell/stack/issues?q=is%3Aopen+is%3Aissue+label%3a%22newcomer+friendly%22) label on the Github issue tracker.

doc/faq.md

@@ -436,11 +436,7 @@ such hardening flags by default which may be the cause of some instances of the
 problem. Therefore, a possible workaround might be to turn off PIE related
 flags.
 
-In Arch Linux, the support for this is provided by the `hardening-wrapper`
-package. Some possible workarounds:
-
-* Selectively disabling its PIE forcing by setting `HARDENING_PIE=0` in `/etc/hardening-wrapper.conf`.
-* Uninstalling the `hardening-wrapper` package and logging out then into your account again.
+On Arch Linux, installing the `ncurses5-compat-libs` package from AUR resolves [this issue](https://github.com/commercialhaskell/stack/issues/2712).
 
 If you manage to work around this in other distributions, please include instructions here.
 

doc/nonstandard_project_init.md

@@ -7,7 +7,9 @@ The purpose of this page is to collect information about issues that arise when
 users either have an existing cabal project or another nonstandard setup such
 as a private hackage database.
 
-## Using a Cabal File New users may be confused by the fact that you must add
+## Using a Cabal File
+
+New users may be confused by the fact that you must add
 dependencies to the package's cabal file, even in the case when you have
 already listed the package in the `stack.yaml`. In most cases, dependencies for
 your package that are in the Stackage snapshot need *only* be added to the

doc/travis_ci.md

@@ -72,15 +72,6 @@ before_install:
 - travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
 ```
 
-Once Travis whitelists the stack .deb files, we'll be able to simply include
-stack in the `addons` section, and automatically use the newest version of
-stack, avoiding that complicated `before_install` section This is being
-tracked in the
-[apt-source-whitelist](https://github.com/travis-ci/apt-source-whitelist/pull/7)
-and
-[apt-package-whitelist](https://github.com/travis-ci/apt-package-whitelist/issues/379)
-issue trackers.
-
 ## Installing GHC
 
 There are two ways to install GHC:

stack-nightly.yaml

@@ -1,13 +1,13 @@
-resolver: nightly-2017-09-14
-image:
-  containers:
-    - base: "fpco/stack-base" # see ./etc/docker/stack-base/Dockerfile
-      name: "fpco/stack-test"
+resolver: nightly-2017-10-17
 nix:
   # --nix on the command-line to enable.
   enable: false
   packages:
     - zlib
     - http-client-tls-0.3.4
+flags:
+  mintty:
+    win32-2-5: false
 extra-deps:
 - bindings-uname-0.1
+- mintty-0.1.1

stack.cabal

@@ -1,5 +1,5 @@
 name:                stack
-version:             1.5.1
+version:             1.6.0.20171017
 synopsis:            The Haskell Tool Stack
 description:         Please see the README.md for usage information, and
                      the wiki on Github for more details.  Also, note that
@@ -262,7 +262,7 @@ library
                    , hastache
                    , project-template >= 0.2
                    , zip-archive >= 0.2.3.7 && < 0.4
-                   , hpack >= 0.17.0 && < 0.19
+                   , hpack >= 0.17.0 && < 0.20
                    , store >= 0.4.1 && < 0.5
                    , store-core >= 0.4 && < 0.5
                    , annotated-wl-pprint
@@ -294,7 +294,7 @@ executable stack
                 , directory >= 1.2.1.0 && < 1.4
                 , filelock >= 0.1.0.1
                 , filepath >= 1.3.0.2
-                , hpack >= 0.17.0 && < 0.19
+                , hpack >= 0.17.0 && < 0.20
                 , http-client >= 0.5.3.3
                 , microlens >= 0.3.0.0
                 , monad-logger

stack.yaml

@@ -1,4 +1,4 @@
-resolver: lts-9.0
+resolver: lts-9.9
 # docker:
 #   enable: true
 #   repo: fpco/stack-full
@@ -23,5 +23,4 @@ extra-deps:
 - path-0.6.1
 - path-io-1.3.3
 - extra-1.6
-- monad-logger-0.3.25
 - hsc2hs-0.68.2