Follow-up to 889dd2e

haskell · Jan 15, 2019 · c3c29a4 · c3c29a4
1 parent 2e93788
commit c3c29a4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Cabal/Distribution/Compat/MonadFail.hs b/Cabal/Distribution/Compat/MonadFail.hs
@@ -2,7 +2,9 @@
 
 -- | Compatibility layer for "Control.Monad.Fail"
 module Distribution.Compat.MonadFail ( MonadFail(fail) ) where
-#if __GLASGOW_HASKELL__ >= 800
+#if MIN_VERSION_base(4,13,0)
+import Prelude (MonadFail(fail))
+#elif MIN_VERSION_base(4,9,0)
 -- provided by base-4.9.0.0 and later
 import Control.Monad.Fail (MonadFail(fail))
 #else

diff --git a/Cabal/Distribution/Parsec.hs b/Cabal/Distribution/Parsec.hs
@@ -74,7 +74,7 @@ class Parsec a where
 --
 -- * knows @cabal-version@ we work with
 --
-class (P.CharParsing m, MonadPlus m) => CabalParsing m where
+class (P.CharParsing m, MonadPlus m, Fail.MonadFail m) => CabalParsing m where
     parsecWarning :: PWarnType -> String -> m ()
 
     parsecHaskellString :: m String