From 681c800873816c022739ca7ed14755e85a579565 Mon Sep 17 00:00:00 2001 From: Emanuel Borsboom Date: Wed, 25 Apr 2018 10:59:14 -0700 Subject: [PATCH] v1.7.1 --- ChangeLog.md | 64 ++++++------------- doc/GUIDE.md | 8 +-- etc/scripts/install-many-stack-releases.hs | 2 +- etc/scripts/stack.yaml | 2 +- package.yaml | 2 +- stack-nightly.yaml | 2 +- stack.yaml | 2 +- test/integration/lib/StackTest.hs | 2 +- .../files/snapshot-modify-lts.yaml | 2 +- .../files/snapshots/local-snapshot.yaml | 2 +- .../files/snapshots/remote-snapshot.yaml | 2 +- .../1337-unicode-everywhere/files/stack.yaml | 2 +- .../1659-skip-component/files/stack.yaml | 2 +- .../1884-url-to-tarball/files/stack.yaml | 2 +- .../tests/2195-depend-on-exe/files/stack.yaml | 2 +- .../tests/32-unlisted-module/files/stack.yaml | 2 +- .../3315-multi-ghc-options/files/stack.yaml | 2 +- .../335-multi-package-flags/files/stack.yaml | 2 +- .../345-override-bytestring/files/stack.yaml | 2 +- .../files/orig-stack.yaml | 2 +- .../3591-cabal-warnings-once/files/stack.yaml | 2 +- .../365-invalid-success/files/stack.yaml | 2 +- .../tests/366-non-root-dir/files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../tests/717-sdist-test/files/stack.yaml | 2 +- .../763-buildable-false/files/stack.yaml | 2 +- .../duplicate-package-ids/files/stack1.yaml | 2 +- .../duplicate-package-ids/files/stack2.yaml | 2 +- .../tests/haddock-options/files/stack.yaml | 2 +- .../files/stack.yaml | 2 +- .../tests/multi-test/files/stack.yaml | 2 +- 32 files changed, 55 insertions(+), 77 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index e8e7e4b8be..de2feb9bbc 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,48 +1,7 @@ # Changelog -## Unreleased changes - -Release notes: - -Major changes: - -Behavior changes: - -Other enhancements: - -Bug fixes: - - -## v1.7.0.3 (release candidate) - -Other enhancements: - -* `stack unpack` now supports a `--to /target/directory` option to - specify where to unpack the package into -* `stack hoogle` now supports a new flag `--server` that launches local - Hoogle server on port 8080. See - [#2310](https://github.com/commercialhaskell/stack/issues/2310) - -Bug fixes: - -* When a package contained sublibraries, stack was always recompiling the - package. This has been fixed now, no recompilation is being done because of - sublibraries. See [#3899](https://github.com/commercialhaskell/stack/issues/3899). -* The `get-stack.sh` install script now matches manual instructions - when it comes to Debian/Fedora/CentOS install dependencies. -* Compile Cabal-simple with gmp when using Nix. - See [#2944](https://github.com/commercialhaskell/stack/issues/2944) -* `stack ghci` now replaces the stack process with ghci. This improves - signal handling behavior. In particular, handling of Ctrl-C. To make - this possible, the generated files are now left behind after exit. - The paths are based on hashing file contents, and it's stored in the - system temporary directory, so this shouldn't result in too much - garbage. See - [#3821](https://github.com/commercialhaskell/stack/issues/3821). - - -## v1.7.0.1 (release candidate) +## v1.7.1 Release notes: @@ -60,7 +19,6 @@ Behavior changes: distributions that use GCC with PIE enabled by default. GHC detects this itself since ghc-8.0.2, and Stack's attempted workaround for older versions caused more problems than it solved. - * `stack new` no longer initializes a project if the project template contains a stack.yaml file. @@ -94,6 +52,11 @@ Other enhancements: i.e. `stack build --keep-tmp-files --ghc-options=-keep-tmp-files`. See [#3857](https://github.com/commercialhaskell/stack/issues/3857) * Improved error messages for snapshot parse exceptions +* `stack unpack` now supports a `--to /target/directory` option to + specify where to unpack the package into +* `stack hoogle` now supports a new flag `--server` that launches local + Hoogle server on port 8080. See + [#2310](https://github.com/commercialhaskell/stack/issues/2310) Bug fixes: @@ -118,11 +81,26 @@ Bug fixes: [#3589](https://github.com/commercialhaskell/stack/issues/3589#issuecomment) * `stack ghci` now uses correct paths for autogen files with [#3791](https://github.com/commercialhaskell/stack/issues/3791) +* When a package contained sublibraries, stack was always recompiling the + package. This has been fixed now, no recompilation is being done because of + sublibraries. See [#3899](https://github.com/commercialhaskell/stack/issues/3899). +* The `get-stack.sh` install script now matches manual instructions + when it comes to Debian/Fedora/CentOS install dependencies. +* Compile Cabal-simple with gmp when using Nix. + See [#2944](https://github.com/commercialhaskell/stack/issues/2944) +* `stack ghci` now replaces the stack process with ghci. This improves + signal handling behavior. In particular, handling of Ctrl-C. To make + this possible, the generated files are now left behind after exit. + The paths are based on hashing file contents, and it's stored in the + system temporary directory, so this shouldn't result in too much + garbage. See + [#3821](https://github.com/commercialhaskell/stack/issues/3821). ## v1.6.5 Bug fixes: + * Some unnecessary rebuilds when no files were changed are now avoided, by having a separate build cache for each component of a package. See [#3732](https://github.com/commercialhaskell/stack/issues/3732). diff --git a/doc/GUIDE.md b/doc/GUIDE.md index 15c7ab2beb..fa2c44a0fc 100644 --- a/doc/GUIDE.md +++ b/doc/GUIDE.md @@ -427,7 +427,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-11.5`, as is currently the latest LTS) +* The appropriate resolver value (`resolver: lts-11.6`, 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 @@ -444,7 +444,7 @@ default as well). ## Resolvers and changing your compiler version -Let's explore package sets a bit further. Instead of lts-11.5, let's change our +Let's explore package sets a bit further. Instead of lts-11.6, let's change our `stack.yaml` file to use [the latest nightly](https://www.stackage.org/nightly). Right now, this is currently 2017-12-19 - please see the resolve from the link above to get the latest. @@ -460,8 +460,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-11.5 build -Downloaded lts-11.5 build plan. +michael@d30748af6d3d:~/helloworld$ stack --resolver lts-11.6 build +Downloaded lts-11.6 build plan. # build output ... ``` diff --git a/etc/scripts/install-many-stack-releases.hs b/etc/scripts/install-many-stack-releases.hs index ba36c68f32..4319755152 100755 --- a/etc/scripts/install-many-stack-releases.hs +++ b/etc/scripts/install-many-stack-releases.hs @@ -1,6 +1,6 @@ #!/usr/bin/env stack {- stack script - --resolver lts-11.5 + --resolver lts-11.6 --package base --package directory --package filepath diff --git a/etc/scripts/stack.yaml b/etc/scripts/stack.yaml index 1cdeab26d6..cee3f00b38 100644 --- a/etc/scripts/stack.yaml +++ b/etc/scripts/stack.yaml @@ -1 +1 @@ -resolver: lts-11.5 +resolver: lts-11.6 diff --git a/package.yaml b/package.yaml index ddb5d1c55b..e00eee88d3 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: stack -version: '1.7.0.4' +version: '1.7.1' 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 diff --git a/stack-nightly.yaml b/stack-nightly.yaml index a74905b1f6..42a4c77c5c 100644 --- a/stack-nightly.yaml +++ b/stack-nightly.yaml @@ -1,4 +1,4 @@ -resolver: nightly-2018-04-23 +resolver: nightly-2018-04-25 # docker: # enable: true diff --git a/stack.yaml b/stack.yaml index 8897d8707a..5808aa6e0f 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-11.5 +resolver: lts-11.6 # docker: # enable: true diff --git a/test/integration/lib/StackTest.hs b/test/integration/lib/StackTest.hs index 0bfab48738..c6394baa6f 100644 --- a/test/integration/lib/StackTest.hs +++ b/test/integration/lib/StackTest.hs @@ -208,7 +208,7 @@ isMacOSX = os == "darwin" -- the main @stack.yaml@. -- defaultResolverArg :: String -defaultResolverArg = "--resolver=lts-11.5" +defaultResolverArg = "--resolver=lts-11.6" -- | Remove a file and ignore any warnings about missing files. removeFileIgnore :: FilePath -> IO () diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml b/test/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml index 371d6e8b3c..68c1e3a821 100644 --- a/test/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml +++ b/test/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml @@ -1,4 +1,4 @@ -resolver: lts-11.5 +resolver: lts-11.6 name: snapshot-modify-lts drop-packages: - zlib diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml b/test/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml index 3c7918fefa..fa7209cf15 100644 --- a/test/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml +++ b/test/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml @@ -1,5 +1,5 @@ --- -resolver: lts-11.5 +resolver: lts-11.6 name: local-snapshot packages: - archive: package-0.1.2.3.tar.gz diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml b/test/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml index f73df9884e..45230e5f4b 100644 --- a/test/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml +++ b/test/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml @@ -1,5 +1,5 @@ --- -resolver: lts-11.5 +resolver: lts-11.6 name: remote-snapshot packages: - archive: https://hackage.haskell.org/package/ghc-prim-0.5.1.1/ghc-prim-0.5.1.1.tar.gz diff --git a/test/integration/tests/1337-unicode-everywhere/files/stack.yaml b/test/integration/tests/1337-unicode-everywhere/files/stack.yaml index dece93f10d..e0ba534fa4 100644 --- a/test/integration/tests/1337-unicode-everywhere/files/stack.yaml +++ b/test/integration/tests/1337-unicode-everywhere/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-11.5 +resolver: lts-11.6 packages: - '.' extra-deps: [] diff --git a/test/integration/tests/1659-skip-component/files/stack.yaml b/test/integration/tests/1659-skip-component/files/stack.yaml index dece93f10d..e0ba534fa4 100644 --- a/test/integration/tests/1659-skip-component/files/stack.yaml +++ b/test/integration/tests/1659-skip-component/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-11.5 +resolver: lts-11.6 packages: - '.' extra-deps: [] diff --git a/test/integration/tests/1884-url-to-tarball/files/stack.yaml b/test/integration/tests/1884-url-to-tarball/files/stack.yaml index d51ac2e3b2..37fae19d52 100644 --- a/test/integration/tests/1884-url-to-tarball/files/stack.yaml +++ b/test/integration/tests/1884-url-to-tarball/files/stack.yaml @@ -2,4 +2,4 @@ packages: - location: https://hackage.haskell.org/package/half-0.2.2.3/half-0.2.2.3.tar.gz extra-dep: false extra-deps: [] -resolver: lts-11.5 +resolver: lts-11.6 diff --git a/test/integration/tests/2195-depend-on-exe/files/stack.yaml b/test/integration/tests/2195-depend-on-exe/files/stack.yaml index 1cdeab26d6..cee3f00b38 100644 --- a/test/integration/tests/2195-depend-on-exe/files/stack.yaml +++ b/test/integration/tests/2195-depend-on-exe/files/stack.yaml @@ -1 +1 @@ -resolver: lts-11.5 +resolver: lts-11.6 diff --git a/test/integration/tests/32-unlisted-module/files/stack.yaml b/test/integration/tests/32-unlisted-module/files/stack.yaml index 61c0527c82..bd9e739cdd 100644 --- a/test/integration/tests/32-unlisted-module/files/stack.yaml +++ b/test/integration/tests/32-unlisted-module/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-11.5 +resolver: lts-11.6 diff --git a/test/integration/tests/3315-multi-ghc-options/files/stack.yaml b/test/integration/tests/3315-multi-ghc-options/files/stack.yaml index 18ebe88caf..2aa7341dac 100644 --- a/test/integration/tests/3315-multi-ghc-options/files/stack.yaml +++ b/test/integration/tests/3315-multi-ghc-options/files/stack.yaml @@ -1,3 +1,3 @@ -resolver: lts-11.5 +resolver: lts-11.6 packages: - '.' diff --git a/test/integration/tests/335-multi-package-flags/files/stack.yaml b/test/integration/tests/335-multi-package-flags/files/stack.yaml index 61c0527c82..bd9e739cdd 100644 --- a/test/integration/tests/335-multi-package-flags/files/stack.yaml +++ b/test/integration/tests/335-multi-package-flags/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-11.5 +resolver: lts-11.6 diff --git a/test/integration/tests/345-override-bytestring/files/stack.yaml b/test/integration/tests/345-override-bytestring/files/stack.yaml index d7119b6016..c625763887 100644 --- a/test/integration/tests/345-override-bytestring/files/stack.yaml +++ b/test/integration/tests/345-override-bytestring/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-11.5 +resolver: lts-11.6 extra-deps: - bytestring-0.10.6.0 packages: diff --git a/test/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml b/test/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml index 5571898de8..bfaad01303 100644 --- a/test/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml +++ b/test/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-11.5 +resolver: lts-11.6 packages: - ./local-mmorph diff --git a/test/integration/tests/3591-cabal-warnings-once/files/stack.yaml b/test/integration/tests/3591-cabal-warnings-once/files/stack.yaml index 1cdeab26d6..cee3f00b38 100644 --- a/test/integration/tests/3591-cabal-warnings-once/files/stack.yaml +++ b/test/integration/tests/3591-cabal-warnings-once/files/stack.yaml @@ -1 +1 @@ -resolver: lts-11.5 +resolver: lts-11.6 diff --git a/test/integration/tests/365-invalid-success/files/stack.yaml b/test/integration/tests/365-invalid-success/files/stack.yaml index 61c0527c82..bd9e739cdd 100644 --- a/test/integration/tests/365-invalid-success/files/stack.yaml +++ b/test/integration/tests/365-invalid-success/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-11.5 +resolver: lts-11.6 diff --git a/test/integration/tests/366-non-root-dir/files/stack.yaml b/test/integration/tests/366-non-root-dir/files/stack.yaml index 61c0527c82..bd9e739cdd 100644 --- a/test/integration/tests/366-non-root-dir/files/stack.yaml +++ b/test/integration/tests/366-non-root-dir/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-11.5 +resolver: lts-11.6 diff --git a/test/integration/tests/397-case-insensitive-flags/files/stack.yaml b/test/integration/tests/397-case-insensitive-flags/files/stack.yaml index 1cdeab26d6..cee3f00b38 100644 --- a/test/integration/tests/397-case-insensitive-flags/files/stack.yaml +++ b/test/integration/tests/397-case-insensitive-flags/files/stack.yaml @@ -1 +1 @@ -resolver: lts-11.5 +resolver: lts-11.6 diff --git a/test/integration/tests/606-local-version-not-exist/files/stack.yaml b/test/integration/tests/606-local-version-not-exist/files/stack.yaml index 61c0527c82..bd9e739cdd 100644 --- a/test/integration/tests/606-local-version-not-exist/files/stack.yaml +++ b/test/integration/tests/606-local-version-not-exist/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-11.5 +resolver: lts-11.6 diff --git a/test/integration/tests/717-sdist-test/files/stack.yaml b/test/integration/tests/717-sdist-test/files/stack.yaml index 7f048fdc2c..e457504ca4 100644 --- a/test/integration/tests/717-sdist-test/files/stack.yaml +++ b/test/integration/tests/717-sdist-test/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-11.5 +resolver: lts-11.6 packages: - package-with-th - package-with-working-th diff --git a/test/integration/tests/763-buildable-false/files/stack.yaml b/test/integration/tests/763-buildable-false/files/stack.yaml index 61c0527c82..bd9e739cdd 100644 --- a/test/integration/tests/763-buildable-false/files/stack.yaml +++ b/test/integration/tests/763-buildable-false/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-11.5 +resolver: lts-11.6 diff --git a/test/integration/tests/duplicate-package-ids/files/stack1.yaml b/test/integration/tests/duplicate-package-ids/files/stack1.yaml index 7dcd7ba515..ffb60781d7 100644 --- a/test/integration/tests/duplicate-package-ids/files/stack1.yaml +++ b/test/integration/tests/duplicate-package-ids/files/stack1.yaml @@ -1,2 +1,2 @@ -resolver: lts-11.5 +resolver: lts-11.6 packages: [] diff --git a/test/integration/tests/duplicate-package-ids/files/stack2.yaml b/test/integration/tests/duplicate-package-ids/files/stack2.yaml index e95def3ba4..e84e675fb5 100644 --- a/test/integration/tests/duplicate-package-ids/files/stack2.yaml +++ b/test/integration/tests/duplicate-package-ids/files/stack2.yaml @@ -1,3 +1,3 @@ -resolver: lts-11.5 +resolver: lts-11.6 packages: - auto-update-0.1.2.1 diff --git a/test/integration/tests/haddock-options/files/stack.yaml b/test/integration/tests/haddock-options/files/stack.yaml index 2256ed2d42..52aa28f79e 100644 --- a/test/integration/tests/haddock-options/files/stack.yaml +++ b/test/integration/tests/haddock-options/files/stack.yaml @@ -2,7 +2,7 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-11.5 +resolver: lts-11.6 build: haddock-arguments: haddock-args: diff --git a/test/integration/tests/module-added-multiple-times/files/stack.yaml b/test/integration/tests/module-added-multiple-times/files/stack.yaml index a7d0553b88..5b21299ffb 100644 --- a/test/integration/tests/module-added-multiple-times/files/stack.yaml +++ b/test/integration/tests/module-added-multiple-times/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-11.5 +resolver: lts-11.6 extra-deps: [] flags: {} extra-package-dbs: [] diff --git a/test/integration/tests/multi-test/files/stack.yaml b/test/integration/tests/multi-test/files/stack.yaml index c92dfb1b2e..79162afba0 100644 --- a/test/integration/tests/multi-test/files/stack.yaml +++ b/test/integration/tests/multi-test/files/stack.yaml @@ -4,4 +4,4 @@ packages: - sub-package - cyclic extra-deps: [] -resolver: lts-11.5 +resolver: lts-11.6