From d9dc6d531c0c7bf1718377d37052470fd56de30d Mon Sep 17 00:00:00 2001 From: Ryan Scott <ryan.gl.scott@gmail.com> Date: Thu, 2 May 2019 08:44:34 -0400 Subject: [PATCH] Bump template-haskell version bounds --- CHANGELOG.markdown | 4 ++++ exceptions.cabal | 2 +- src/Control/Monad/Catch/Pure.hs | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown index 43117c5..0f865a9 100644 --- a/CHANGELOG.markdown +++ b/CHANGELOG.markdown @@ -1,3 +1,7 @@ +next [????.??.??] +----------------- +* Allow building with `base-4.13`/`template-haskell-2.15`. + 0.10.1 [2019.03.26] ------------------- * Define a `MonadFail` instance for `CatchT`. diff --git a/exceptions.cabal b/exceptions.cabal index 3f4e222..9ff1bc1 100644 --- a/exceptions.cabal +++ b/exceptions.cabal @@ -45,7 +45,7 @@ library build-depends: base >= 4.3 && < 5, stm >= 2.2 && < 3, - template-haskell >= 2.2 && < 2.15, + template-haskell >= 2.2 && < 2.16, transformers >= 0.2 && < 0.6, transformers-compat >= 0.3 && < 0.7, mtl >= 2.0 && < 2.3 diff --git a/src/Control/Monad/Catch/Pure.hs b/src/Control/Monad/Catch/Pure.hs index 0d96957..4e433b5 100644 --- a/src/Control/Monad/Catch/Pure.hs +++ b/src/Control/Monad/Catch/Pure.hs @@ -110,7 +110,7 @@ instance Monad m => Monad (CatchT m) where CatchT m >>= k = CatchT $ m >>= \ea -> case ea of Left e -> return (Left e) Right a -> runCatchT (k a) -#if !MIN_VERSION_base(4,13,0) +#if !(MIN_VERSION_base(4,13,0)) fail = Fail.fail #endif -- GitLab