From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Sun, 20 Sep 2015 12:50:46 +0000 (+0100)
Subject: dev-haskell/frown: port to ghc-7.8, bug #524790
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ae817ee6eaf5c1c919a13e523e7c5b78ca0fd38a;p=gentoo.git

dev-haskell/frown: port to ghc-7.8, bug #524790

Package-Manager: portage-2.2.20
---

diff --git a/dev-haskell/frown/files/frown-0.6.1-ghc-7.10.patch b/dev-haskell/frown/files/frown-0.6.1-ghc-7.10.patch
index 7ba54070eb95..119f2260b83e 100644
--- a/dev-haskell/frown/files/frown-0.6.1-ghc-7.10.patch
+++ b/dev-haskell/frown/files/frown-0.6.1-ghc-7.10.patch
@@ -38,6 +38,10 @@ diff --git a/Convert.lhs b/Convert.lhs
 index 01d2c32..d31f437 100644
 --- a/Convert.lhs
 +++ b/Convert.lhs
+@@ -50,2 +50,3 @@
+ > import Control.Monad
++> import Control.Applicative
+ > import System.IO                     hiding (  isEOF  )
 @@ -235,2 +235,9 @@ Writer monad for collecting multiple error messages.
  
 +> instance Functor (Writer w) where
@@ -104,6 +108,10 @@ diff --git a/Lib/OrdUniqListSet.lhs b/Lib/OrdUniqListSet.lhs
 index ddb8629..decf65d 100644
 --- a/Lib/OrdUniqListSet.lhs
 +++ b/Lib/OrdUniqListSet.lhs
+@@ -63,2 +63,3 @@
+ > import Control.Monad
++> import Control.Applicative (Applicative, pure, (<*>))
+ 
 @@ -114,2 +114,6 @@ Yes, \tr{Set} is a functor and a monad.
  >
 +> instance Applicative Set where