Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

allow happy ==2.0.2 || >=2.1.2 && <2.2 #278

Closed
wants to merge 1 commit into from
Closed

allow happy ==2.0.2 || >=2.1.2 && <2.2 #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CI.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ghc-lib-gen.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ghc-lib-gen/src/Ghclibgen.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading