Skip to content

Commit

Permalink
dev-lang/helium: port to ghc-7.10, bug #557938 by Toralf Förster
Browse files Browse the repository at this point in the history
Package-Manager: portage-2.2.20
  • Loading branch information
Sergei Trofimovich committed Aug 16, 2015
1 parent 1bfbafd commit 646f22b
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 0 deletions.
55 changes: 55 additions & 0 deletions dev-lang/helium/files/helium-1.8.1-ghc-7.10.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
diff --git a/src/Helium/Parser/LexerMonad.hs b/src/Helium/Parser/LexerMonad.hs
index 75ac077..af35093 100644
--- a/src/Helium/Parser/LexerMonad.hs
+++ b/src/Helium/Parser/LexerMonad.hs
@@ -20,2 +20,4 @@ import Helium.Parser.LexerMessage
import Text.ParserCombinators.Parsec.Pos
+import Control.Applicative
+import Control.Monad

@@ -47,2 +49,9 @@ returnLM x = LM (\_ pos brackets -> Right (x, [], pos, brackets))

+instance Functor LexerMonad where
+ fmap = liftM
+
+instance Applicative LexerMonad where
+ pure = return
+ (<*>) = ap -- defined in Control.Monad
+
instance Monad LexerMonad where
diff --git a/src/Helium/StaticAnalysis/Heuristics/OnlyResultHeuristics.hs b/src/Helium/StaticAnalysis/Heuristics/OnlyResultHeuristics.hs
index 880ac0b..90574f0 100644
--- a/src/Helium/StaticAnalysis/Heuristics/OnlyResultHeuristics.hs
+++ b/src/Helium/StaticAnalysis/Heuristics/OnlyResultHeuristics.hs
@@ -1 +1,2 @@
+{-# LANGUAGE FlexibleContexts #-}
{-| Module : OnlyResultHeuristics
diff --git a/src/Helium/StaticAnalysis/Heuristics/RepairHeuristics.hs b/src/Helium/StaticAnalysis/Heuristics/RepairHeuristics.hs
index 89e43f2..251406f 100644
--- a/src/Helium/StaticAnalysis/Heuristics/RepairHeuristics.hs
+++ b/src/Helium/StaticAnalysis/Heuristics/RepairHeuristics.hs
@@ -1 +1,2 @@
+{-# LANGUAGE FlexibleContexts #-}
{-| Module : RepairHeuristics
diff --git a/src/Helium/StaticAnalysis/Heuristics/TieBreakerHeuristics.hs b/src/Helium/StaticAnalysis/Heuristics/TieBreakerHeuristics.hs
index d0b01a3..ba7ca19 100644
--- a/src/Helium/StaticAnalysis/Heuristics/TieBreakerHeuristics.hs
+++ b/src/Helium/StaticAnalysis/Heuristics/TieBreakerHeuristics.hs
@@ -1 +1,2 @@
+{-# LANGUAGE FlexibleContexts #-}
{-| Module : TieBreakerHeuristics
diff --git a/src/Helium/StaticAnalysis/Heuristics/UnifierHeuristics.hs b/src/Helium/StaticAnalysis/Heuristics/UnifierHeuristics.hs
index c2e91f5..493c882 100644
--- a/src/Helium/StaticAnalysis/Heuristics/UnifierHeuristics.hs
+++ b/src/Helium/StaticAnalysis/Heuristics/UnifierHeuristics.hs
@@ -1 +1,2 @@
+{-# LANGUAGE FlexibleContexts #-}
{-| Module : UnifierHeuristics
diff --git a/src/Helium/Syntax/UHA_Pretty.hs b/src/Helium/Syntax/UHA_Pretty.hs
index af970dc..ee42a48 100644
--- a/src/Helium/Syntax/UHA_Pretty.hs
+++ b/src/Helium/Syntax/UHA_Pretty.hs
@@ -17,2 +17,3 @@ import Control.Monad.Identity (Identity)
import qualified Control.Monad.Identity
+import Prelude hiding ((<$>))

4 changes: 4 additions & 0 deletions dev-lang/helium/helium-1.8.1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,7 @@ RDEPEND=">=dev-haskell/lvmlib-1.1:=[profile?]
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.10.1.0
"

src_prepare() {
epatch "${FILESDIR}"/${PN}-1.8.1-ghc-7.10.patch
}

0 comments on commit 646f22b

Please sign in to comment.