diff options
| author | Vladislav Zavialov <vlad.z.4096@gmail.com> | 2020-08-25 15:52:56 +0300 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-09-19 15:47:24 -0400 |
| commit | 2229d570fc78867190febb4f13c799b258a41f6d (patch) | |
| tree | f244c2e43d116c3aac7cb68da58ef303e0a5406f | |
| parent | 45fa82182bc61e3966fd51496c35130cd067a5df (diff) | |
| download | haskell-2229d570fc78867190febb4f13c799b258a41f6d.tar.gz | |
Require happy >=1.20
| -rwxr-xr-x | .gitlab/ci.sh | 2 | ||||
| -rw-r--r-- | aclocal.m4 | 4 | ||||
| -rw-r--r-- | hadrian/cabal.project | 2 | ||||
| -rw-r--r-- | hadrian/hadrian.cabal | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index 4b37a00b83..938cc22da9 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -6,7 +6,7 @@ set -e -o pipefail # Configuration: -hackage_index_state="@1579718451" +hackage_index_state="2020-09-14T19:30:43Z" # Colors BLACK="0;30" diff --git a/aclocal.m4 b/aclocal.m4 index 6a3fe14e4d..795d987b81 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1063,8 +1063,8 @@ changequote([, ])dnl ]) if test ! -f compiler/GHC/Parser.hs || test ! -f compiler/GHC/Cmm/Parser.hs then - FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-lt],[1.19.10], - [AC_MSG_ERROR([Happy version 1.19.10 or later is required to compile GHC.])])[] + FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-lt],[1.20.0], + [AC_MSG_ERROR([Happy version 1.20 or later is required to compile GHC.])])[] FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-ge],[1.21.0], [AC_MSG_ERROR([Happy version 1.20 or earlier is required to compile GHC.])])[] fi diff --git a/hadrian/cabal.project b/hadrian/cabal.project index 6d928fe37f..d5f656d172 100644 --- a/hadrian/cabal.project +++ b/hadrian/cabal.project @@ -1,7 +1,7 @@ packages: ./ -- This essentially freezes the build plan for hadrian -index-state: 2020-06-16T03:59:14Z +index-state: 2020-09-14T19:30:43Z -- N.B. Compile with -O0 since this is not a performance-critical executable -- and the Cabal takes nearly twice as long to build with -O1. See #16817. diff --git a/hadrian/hadrian.cabal b/hadrian/hadrian.cabal index 2ed090eebd..290af0cd8b 100644 --- a/hadrian/hadrian.cabal +++ b/hadrian/hadrian.cabal @@ -148,7 +148,7 @@ executable hadrian , transformers >= 0.4 && < 0.6 , unordered-containers >= 0.2.1 && < 0.3 build-tools: alex >= 3.1 - , happy >= 1.19.10 && < 1.21 + , happy >= 1.20.0 && < 1.21 ghc-options: -Wall -Wincomplete-record-updates -Wredundant-constraints |