From 229094dfffe73be1b2dc2b90db941a9034276fd3 Mon Sep 17 00:00:00 2001 From: Shayne Fletcher Date: Fri, 20 Sep 2024 09:39:09 -0400 Subject: [PATCH] fix happy to 1.20.1.1 --- ghc-lib-gen.cabal | 2 +- ghc-lib-gen/src/Ghclibgen.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ghc-lib-gen.cabal b/ghc-lib-gen.cabal index 590b7ac5..fc0f074a 100644 --- a/ghc-lib-gen.cabal +++ b/ghc-lib-gen.cabal @@ -52,7 +52,7 @@ executable ghc-lib-gen executable ghc-lib-build-tool import: base - build-tool-depends: alex:alex, happy:happy + build-tool-depends: alex:alex, happy:happy < 2.0 build-depends: directory, filepath, time, extra, optparse-applicative if flag(semaphore-compat) diff --git a/ghc-lib-gen/src/Ghclibgen.hs b/ghc-lib-gen/src/Ghclibgen.hs index 1c0dc683..b1fc4b74 100644 --- a/ghc-lib-gen/src/Ghclibgen.hs +++ b/ghc-lib-gen/src/Ghclibgen.hs @@ -1354,7 +1354,7 @@ generateGhcLibCabal ghcFlavor customCppOpts = do " build-depends:" ], indent2 (Data.List.NonEmpty.toList (withCommas (ghcLibBuildDepends ghcFlavor))), - [" build-tool-depends: alex:alex >= 3.1, " ++ "happy:happy > " ++ if ghcSeries ghcFlavor < GHC_8_10 then "1.19" else "1.20"], + [" build-tool-depends: alex:alex >= 3.1, " ++ "happy:happy > " ++ if ghcSeries ghcFlavor < GHC_8_10 then "1.19" else "1.20" ++ " && < 2.0"], [" other-extensions:"], indent2 (askField lib "other-extensions:"), [" default-extensions:"], @@ -1464,7 +1464,7 @@ generateGhcLibParserCabal ghcFlavor customCppOpts = do [ " if impl(ghc >= 9.10)", " build-depends: ghc-internal" ], - [" build-tool-depends: alex:alex >= 3.1, " ++ "happy:happy > " ++ if ghcSeries ghcFlavor < GHC_8_10 then "1.19" else "1.20"], + [" build-tool-depends: alex:alex >= 3.1, " ++ "happy:happy > " ++ if ghcSeries ghcFlavor < GHC_8_10 then "1.19" else "1.20" ++ " && < 2.0"], [" other-extensions:"], indent2 (askField lib "other-extensions:"), [" default-extensions:"],