[Git][ghc/ghc][wip/happy-1.20] Require happy >=1.20

[Vladislav Zavialov]

Vladislav Zavialov pushed to branch wip/happy-1.20 at Glasgow Haskell Compiler / GHC


Commits:
c8b84815 by Vladislav Zavialov at 2020-08-26T18:20:44+03:00
Require happy >=1.20

- - - - -


5 changed files:

- .gitlab-ci.yml
- .gitlab/ci.sh
- aclocal.m4
- hadrian/cabal.project
- hadrian/hadrian.cabal


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -2,7 +2,7 @@ variables:
   GIT_SSL_NO_VERIFY: "1"
 
   # Commit of ghc/ci-images repository from which to pull Docker images
-  DOCKER_REV: b65e1145d7c0a62c3533904a88dac14f56fb371b
+  DOCKER_REV: f408f461fcadcb6081a330f6570186425d99ade7
 
   # Sequential version number capturing the versions of all tools fetched by
   # .gitlab/ci.sh.


=====================================
.gitlab/ci.sh
=====================================
@@ -6,7 +6,7 @@
 set -e -o pipefail
 
 # Configuration:
-hackage_index_state="@1579718451"
+hackage_index_state="2020-08-25T12:30:13Z"
 
 # Colors
 BLACK="0;30"


=====================================
aclocal.m4
=====================================
@@ -1021,8 +1021,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.0 or later is required to compile GHC.])])[]
 fi
 HappyVersion=$fptools_cv_happy_version;
 AC_SUBST(HappyVersion)


=====================================
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-08-25T12:30:13Z
 
 -- 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.


=====================================
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
+                       , happy >= 1.20.0
     ghc-options:       -Wall
                        -Wincomplete-record-updates
                        -Wredundant-constraints



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c8b84815a4448008c6857f8982fba22ede41650c

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c8b84815a4448008c6857f8982fba22ede41650c
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20200826/fb0ade61/attachment-0001.html>