diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2018-12-18 23:36:29 +0100 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2019-01-18 17:01:56 -0500 |
| commit | c9756dbf1ee58b117ea5c4ded45dea88030efd65 (patch) | |
| tree | 66aa32d9fdc0303c3b15f3fdb9605e30d8aa2449 /libraries/template-haskell | |
| parent | b14f54041eacf8c0f85e756148042d2dca8333f9 (diff) | |
| download | haskell-c9756dbf1ee58b117ea5c4ded45dea88030efd65.tar.gz | |
Prepare source-tree for base-4.13 MFP bump
Diffstat (limited to 'libraries/template-haskell')
| -rw-r--r-- | libraries/template-haskell/Language/Haskell/TH/Syntax.hs | 4 | ||||
| -rw-r--r-- | libraries/template-haskell/template-haskell.cabal | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libraries/template-haskell/Language/Haskell/TH/Syntax.hs b/libraries/template-haskell/Language/Haskell/TH/Syntax.hs index 770fac7580..705222a2f9 100644 --- a/libraries/template-haskell/Language/Haskell/TH/Syntax.hs +++ b/libraries/template-haskell/Language/Haskell/TH/Syntax.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE DeriveDataTypeable, +{-# LANGUAGE CPP, DeriveDataTypeable, DeriveGeneric, FlexibleInstances, DefaultSignatures, RankNTypes, RoleAnnotations, ScopedTypeVariables, Trustworthy #-} @@ -178,7 +178,9 @@ runQ (Q m) = m instance Monad Q where Q m >>= k = Q (m >>= \x -> unQ (k x)) (>>) = (*>) +#if !MIN_VERSION_base(4,13,0) fail = Fail.fail +#endif instance Fail.MonadFail Q where fail s = report True s >> Q (Fail.fail "Q monad failure") diff --git a/libraries/template-haskell/template-haskell.cabal b/libraries/template-haskell/template-haskell.cabal index 90d67fc774..cdb60c4709 100644 --- a/libraries/template-haskell/template-haskell.cabal +++ b/libraries/template-haskell/template-haskell.cabal @@ -51,7 +51,7 @@ Library Language.Haskell.TH.Lib.Map build-depends: - base >= 4.9 && < 4.13, + base >= 4.11 && < 4.14, ghc-boot-th == 8.7.*, pretty == 1.1.* |