summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSylvain Henry <sylvain@haskus.fr>2019-06-24 18:36:07 +0200
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-06-27 10:44:25 -0400
commit90e0ab7d80d88463df97bc3514fc89d2ab9fcfca (patch)
tree2502e61230d812bdcf797184402c54d2c4669a38
parent52f102166c9677fbc58ac86203eab388913fbdf0 (diff)
downloadhaskell-90e0ab7d80d88463df97bc3514fc89d2ab9fcfca.tar.gz
Fix Happy deps for Stack (#16825)
-rw-r--r--hadrian/stack.yaml15
1 files changed, 5 insertions, 10 deletions
diff --git a/hadrian/stack.yaml b/hadrian/stack.yaml
index 4a21415908..26c219cb74 100644
--- a/hadrian/stack.yaml
+++ b/hadrian/stack.yaml
@@ -3,21 +3,16 @@
# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
resolver: lts-13.21
+extra-deps:
+# We need a newer happy (see #16825)
+- git: https://github.com/simonmar/happy.git
+ commit: 66982277ac7aed23edbb36c5f7aa5a86e5bdf778
+
# Local packages, usually specified by relative directory name
packages:
- '.'
- '../libraries/Cabal/Cabal'
-# 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:
-#
-# In the dependencies for happy-1.19.9:
-# Cabal-2.3.0.0 from stack configuration does not match <2.2 (latest matching version is 2.0.1.1)
-# needed due to hadrian-0.1.0.0 -> happy-1.19.9
-#
-# TODO: Remove this once it's no longer necessary
-allow-newer: true
-
nix:
enable: false
packages: