fiddle with happy bounds again (#567)

digital-asset · Nov 7, 2024 · e9e2104 · e9e2104
1 parent 2ca3e31
commit e9e2104
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/CI.hs b/CI.hs
@@ -98,7 +98,7 @@ data DaFlavor = DaFlavor
 
 -- Last tested gitlab.haskell.org/ghc/ghc.git at
 current :: String
-current = "c08b68bc7ab947843d20621eb483a0fc3c42703a" -- 2024-10-12
+current = "573cad4bd9e7fc146581d9711d36c4e3bacbb6e9" -- 2024-11-03
 
 ghcFlavorOpt :: GhcFlavor -> String
 ghcFlavorOpt = \case

diff --git a/ghc-lib-gen.cabal b/ghc-lib-gen.cabal
@@ -53,7 +53,7 @@ executable ghc-lib-gen
 executable ghc-lib-build-tool
   import: base
   if impl (ghc > 9.12.0)
-    build-tool-depends: alex:alex, happy:happy == 1.20.* || >= 2.0.2 && < 2.1
+    build-tool-depends: alex:alex, happy:happy == 1.20.* || == 2.0.2 || >= 2.1.2 && < 2.2
   else
     build-tool-depends: alex:alex, happy:happy < 2.0
   build-depends:

diff --git a/ghc-lib-gen/src/Ghclibgen.hs b/ghc-lib-gen/src/Ghclibgen.hs
@@ -1298,7 +1298,7 @@ libBinParserLibModules ghcFlavor = do
 happyBounds :: GhcFlavor -> String
 happyBounds ghcFlavor
   | series < GHC_9_8 = "== 1.20.*"
-  | otherwise = "== 1.20.* || >= 2.0.2 && < 2.1" -- c.f. m4/fptools_happy.m4
+  | otherwise = "== 1.20.* || == 2.0.2 || >= 2.1.2 && < 2.2" -- c.f. m4/fptools_happy.m4
   where
     series = ghcSeries ghcFlavor