summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Mitchell <ndmitchell@gmail.com>2019-02-07 14:50:47 +0000
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-02-09 12:22:30 -0500
commit249b0babb08409311a56da0ef890445676927fb7 (patch)
tree17b280c385c89bcc54d2a5ba6952e548d62af84d
parent9adb7f64b37122d391247aa80227f68b41c11c77 (diff)
downloadhaskell-249b0babb08409311a56da0ef890445676927fb7.tar.gz
Upgrade to the latest stack resolver
-rw-r--r--hadrian/stack.yaml7
1 files changed, 5 insertions, 2 deletions
diff --git a/hadrian/stack.yaml b/hadrian/stack.yaml
index d379133384..7f069440ad 100644
--- a/hadrian/stack.yaml
+++ b/hadrian/stack.yaml
@@ -1,13 +1,12 @@
# For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration.html
# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
-resolver: lts-12.10
+resolver: lts-13.6
# Local packages, usually specified by relative directory name
packages:
- '.'
- '../libraries/Cabal/Cabal'
-- '../libraries/text'
# This is necessary to build until happy's version bounds are updated to work
# with the new Cabal version. Stack's error message explains the issue:
@@ -19,6 +18,10 @@ packages:
# TODO: Remove this once it's no longer necessary
allow-newer: true
+# shake-0.17.4 and below depend on heaps, which depends on a specific Cabal
+extra-deps:
+- shake-0.17.5
+
nix:
enable: false
packages: