Merge remote-tracking branch 'origin/release' into stable

Author: borsboom

ChangeLog.md

@@ -1,5 +1,6 @@
 # Changelog
 
+
 ## Unreleased changes
 
 Release notes:
@@ -41,6 +42,13 @@ Bug fixes:
   [hackage-security #187](https://github.com/haskell/hackage-security/issues/187)
   and [#3073](https://github.com/commercialhaskell/stack/issues/3073).
 
+
+## v1.6.3.1
+
+Hackage-only release with no user facing changes (updated to build with
+newer version of hpack dependency).
+
+
 ## v1.6.3
 
 Enhancements:

stack-nightly.yaml

@@ -1,12 +1,12 @@
-resolver: nightly-2018-02-11
+resolver: nightly-2018-02-16
 nix:
   # --nix on the command-line to enable.
   enable: false
   packages:
     - zlib
     - http-client-tls-0.3.4
 extra-deps:
-- hpack-0.26.0
+- hpack-0.27.0
 - archive: https://github.com/haskell/hackage-security/archive/3297b0f3f4285cb30321baaa7b54e3d22e1f6bd7.tar.gz
   subdirs:
   - hackage-security