Commit 53635962 authored by Ryan Scott's avatar Ryan Scott Committed by Herbert Valerio Riedel

Update happy patch to accommodate Cabal-3.0.* changes

`happy-1.19.11` adapts to `MonadFail`-related changes in
`base-4.13.*`, but alas, its custom `Setup` script must also be
tweaked to adapt to the removal of `rawSystemProgramConf` in
`Cabal-3.0.*`.
parent a3d489b6
diff -ru happy-1.19.10.orig/src/AttrGrammarParser.hs happy-1.19.10/src/AttrGrammarParser.hs
--- happy-1.19.10.orig/src/AttrGrammarParser.hs 2019-05-09 03:31:41.000000000 -0400
+++ happy-1.19.10/src/AttrGrammarParser.hs 2019-05-11 08:44:12.337786973 -0400
@@ -339,7 +339,7 @@
happyError :: P a
-happyError = fail ("Parse error\n")
+happyError = failP ("Parse error\n")
{-# LINE 1 "templates/GenericTemplate.hs" #-}
{-# LINE 1 "templates/GenericTemplate.hs" #-}
{-# LINE 1 "<built-in>" #-}
diff -ru happy-1.19.11.orig/Setup.lhs happy-1.19.11/Setup.lhs
--- happy-1.19.11.orig/Setup.lhs 2019-06-06 03:20:45.000000000 -0400
+++ happy-1.19.11/Setup.lhs 2019-06-13 07:19:11.018577108 -0400
@@ -45,7 +45,7 @@
_ -> []
myPostBuild _ flags _ lbi = do
- let runProgram p = rawSystemProgramConf (fromFlagOrDefault normal (buildVerbosity flags))
+ let runProgram p = runDbProgram (fromFlagOrDefault normal (buildVerbosity flags))
p
(withPrograms lbi)
cpp_template src dst opts = do
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment