From 05d31d66217734172c944b2b8a71f7cf0aa445c0 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 30 Jul 2014 11:33:38 +0300
Subject: [PATCH] Add MonadActive instances

---
 yesod-core/Yesod/Core/Types.hs | 10 ++++++++++
 yesod-core/yesod-core.cabal    |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/yesod-core/Yesod/Core/Types.hs b/yesod-core/Yesod/Core/Types.hs
index 09d274f8..388dfe32 100644
--- a/yesod-core/Yesod/Core/Types.hs
+++ b/yesod-core/Yesod/Core/Types.hs
@@ -68,6 +68,9 @@ import           Yesod.Routes.Class                 (RenderRoute (..), ParseRout
 import           Control.Monad.Reader               (MonadReader (..))
 import Prelude hiding (catch)
 import Control.DeepSeq (NFData (rnf))
+#if MIN_VERSION_conduit(1, 1, 0)
+import Data.Conduit.Lazy (MonadActive, monadActive)
+#endif
 
 -- Sessions
 type SessionMap = Map Text ByteString
@@ -458,6 +461,13 @@ instance MonadIO m => MonadLogger (WidgetT site m) where
     monadLoggerLog a b c d = WidgetT $ \hd ->
         liftIO $ fmap (, mempty) $ rheLog (handlerEnv hd) a b c (toLogStr d)
 
+#if MIN_VERSION_conduit(1, 1, 0)
+instance MonadActive m => MonadActive (WidgetT site m) where
+    monadActive = lift monadActive
+instance MonadActive m => MonadActive (HandlerT site m) where
+    monadActive = lift monadActive
+#endif
+
 instance MonadTrans (HandlerT site) where
     lift = HandlerT . const
 
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index 16b89374..81c138ca 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -1,5 +1,5 @@
 name:            yesod-core
-version:         1.2.18
+version:         1.2.19
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>