From 79d22645560fdd8c5c9420a698033e6b214d23de Mon Sep 17 00:00:00 2001 From: Shayne Fletcher Date: Tue, 22 Oct 2024 13:40:03 -0400 Subject: [PATCH] remove bounds on happy --- 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 fc0f074a..590b7ac5 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 < 2.0 + build-tool-depends: alex:alex, happy:happy 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 a4bd4c7a..73ab846f 100644 --- a/ghc-lib-gen/src/Ghclibgen.hs +++ b/ghc-lib-gen/src/Ghclibgen.hs @@ -1357,7 +1357,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" ++ " && < 2.0"], + [" build-tool-depends: alex:alex >= 3.1, " ++ "happy:happy > " ++ if ghcSeries ghcFlavor < GHC_8_10 then "1.19" else "1.20"], [" other-extensions:"], indent2 (askField lib "other-extensions:"), [" default-extensions:"], @@ -1467,7 +1467,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" ++ " && < 2.0"], + [" build-tool-depends: alex:alex >= 3.1, " ++ "happy:happy > " ++ if ghcSeries ghcFlavor < GHC_8_10 then "1.19" else "1.20"], [" other-extensions:"], indent2 (askField lib "other-extensions:"), [" default-extensions:"],