[DHG_packages] 24/34: monad-logger: Patch to build with ghc-8.0.2

[Ilias Tsitsimpis]

This is an automated email from the git hooks/post-receive script.

iliastsi-guest pushed a commit to branch ghc-8.0.2
in repository DHG_packages.

commit e4e3af9d38114086464250bbe25835591ca4cc64
Author: Ilias Tsitsimpis <i.tsitsimpis at gmail.com>
Date:   Wed Jan 25 21:25:23 2017 +0200

    monad-logger: Patch to build with ghc-8.0.2
---
 p/haskell-monad-logger/debian/changelog               |  6 ++++++
 p/haskell-monad-logger/debian/patches/ghc-8.0.2       | 19 +++++++++++++++++++
 p/haskell-monad-logger/debian/patches/series          |  1 +
 .../debian/patches/use-template-haskell-loc           | 10 +++++++---
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/p/haskell-monad-logger/debian/changelog b/p/haskell-monad-logger/debian/changelog
index 2dbbf09..fad04be 100644
--- a/p/haskell-monad-logger/debian/changelog
+++ b/p/haskell-monad-logger/debian/changelog
@@ -1,3 +1,9 @@
+haskell-monad-logger (0.3.20-3) unstable; urgency=medium
+
+  * Patch to build with ghc-8.0.2.
+
+ -- Ilias Tsitsimpis <i.tsitsimpis at gmail.com>  Wed, 25 Jan 2017 19:47:55 +0200
+
 haskell-monad-logger (0.3.20-2) unstable; urgency=medium
 
   * Upload to unstable as part of GHC 8 transition.
diff --git a/p/haskell-monad-logger/debian/patches/ghc-8.0.2 b/p/haskell-monad-logger/debian/patches/ghc-8.0.2
new file mode 100644
index 0000000..4b6ec6d
--- /dev/null
+++ b/p/haskell-monad-logger/debian/patches/ghc-8.0.2
@@ -0,0 +1,19 @@
+Description: Fix build with GHC 8.0.2
+Author: Ryan Scott <ryan.gl.scott at gmail.com>
+Origin: upstream, https://github.com/kazu-yamamoto/logger/pull/108
+
+Index: b/Control/Monad/Logger.hs
+===================================================================
+--- a/Control/Monad/Logger.hs
++++ b/Control/Monad/Logger.hs
+@@ -207,8 +207,8 @@ class (MonadLogger m, MonadIO m) => Mona
+     --
+     -- Since 0.3.10
+     askLoggerIO :: m (Loc -> LogSource -> LogLevel -> LogStr -> IO ())
+-    default askLoggerIO :: (Trans.MonadTrans t, MonadLogger (t m), MonadIO (t m))
+-                        => t m (Loc -> LogSource -> LogLevel -> LogStr -> IO ())
++    default askLoggerIO :: (Trans.MonadTrans t, MonadLoggerIO n, m ~ t n)
++                        => m (Loc -> LogSource -> LogLevel -> LogStr -> IO ())
+     askLoggerIO = Trans.lift askLoggerIO
+ 
+ 
diff --git a/p/haskell-monad-logger/debian/patches/series b/p/haskell-monad-logger/debian/patches/series
index e218465..620069d 100644
--- a/p/haskell-monad-logger/debian/patches/series
+++ b/p/haskell-monad-logger/debian/patches/series
@@ -1 +1,2 @@
 use-template-haskell-loc
+ghc-8.0.2
diff --git a/p/haskell-monad-logger/debian/patches/use-template-haskell-loc b/p/haskell-monad-logger/debian/patches/use-template-haskell-loc
index 040508c..e98652b 100644
--- a/p/haskell-monad-logger/debian/patches/use-template-haskell-loc
+++ b/p/haskell-monad-logger/debian/patches/use-template-haskell-loc
@@ -1,8 +1,10 @@
 Author: Joachim Breitner <nomeata at debian.org>
 
+Index: b/Control/Monad/Logger.hs
+===================================================================
 --- a/Control/Monad/Logger.hs
 +++ b/Control/Monad/Logger.hs
-@@ -93,6 +93,8 @@
+@@ -93,6 +93,8 @@ module Control.Monad.Logger
  
  #if WITH_TEMPLATE_HASKELL
  import Language.Haskell.TH.Syntax (Lift (lift), Q, Exp, Loc (..), qLocation)
@@ -11,7 +13,7 @@ Author: Joachim Breitner <nomeata at debian.org>
  #endif
  
  import Data.Monoid (Monoid)
-@@ -185,16 +187,6 @@
+@@ -185,16 +187,6 @@ instance Lift LogLevel where
      lift LevelError = [|LevelError|]
      lift (LevelOther x) = [|LevelOther $ pack $(lift $ unpack x)|]
  
@@ -28,9 +30,11 @@ Author: Joachim Breitner <nomeata at debian.org>
  #endif
  
  -- | A @Monad@ which has the ability to log messages in some manner.
+Index: b/monad-logger.cabal
+===================================================================
 --- a/monad-logger.cabal
 +++ b/monad-logger.cabal
-@@ -44,13 +44,11 @@
+@@ -44,13 +44,11 @@ library
                       , bytestring
                       , blaze-builder
                       , exceptions

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git