diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2019-06-24 18:36:07 +0200 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-06-30 07:40:28 -0400 |
| commit | 6e255b62a998632f83cd1ae73b6673b9088694c2 (patch) | |
| tree | ac515c71fb72a0ef7348c09835f29b84f325816e | |
| parent | 59fdb0f50c65f612530f8a06a1014aa810a03489 (diff) | |
| download | haskell-6e255b62a998632f83cd1ae73b6673b9088694c2.tar.gz | |
Fix Happy deps for Stack (#16825)
(cherry picked from commit 90e0ab7d80d88463df97bc3514fc89d2ab9fcfca)
| -rw-r--r-- | hadrian/stack.yaml | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/hadrian/stack.yaml b/hadrian/stack.yaml index d379133384..3566a35571 100644 --- a/hadrian/stack.yaml +++ b/hadrian/stack.yaml @@ -3,22 +3,17 @@ # 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 +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' - '../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: -# -# 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: |