diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2016-02-10 10:25:18 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2016-02-10 10:25:28 +0000 |
| commit | e9af79d286cb13ce56783b56ac043091718e46a6 (patch) | |
| tree | a4353d885a6f40a8e1634d641fd5430ba9ad851d /app-emulation | |
| parent | dev-ml/ocaml-cstruct: bump to 1.8.0 (diff) | |
| download | gentoo-e9af79d286cb13ce56783b56ac043091718e46a6.tar.gz gentoo-e9af79d286cb13ce56783b56ac043091718e46a6.tar.bz2 gentoo-e9af79d286cb13ce56783b56ac043091718e46a6.zip | |
app-emulation/ganeti-htools: tweak for ghc-7.10
Package-Manager: portage-2.2.27
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-ghc-7.10.patch | 29 | ||||
| -rw-r--r-- | app-emulation/ganeti-htools/ganeti-htools-0.3.1.ebuild | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-ghc-7.10.patch b/app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-ghc-7.10.patch new file mode 100644 index 000000000000..51c39fe5fce5 --- /dev/null +++ b/app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-ghc-7.10.patch @@ -0,0 +1,29 @@ +diff --git a/Ganeti/HTools/Types.hs b/Ganeti/HTools/Types.hs +index 104bf64..8146870 100644 +--- a/Ganeti/HTools/Types.hs ++++ b/Ganeti/HTools/Types.hs +@@ -65,2 +65,4 @@ import qualified Data.Map as M + import qualified Text.JSON as JSON ++import Control.Applicative ++import Control.Monad + +@@ -221,2 +223,9 @@ data Result a + ++instance Functor Result where ++ fmap = liftM ++ ++instance Applicative Result where ++ pure = return ++ (<*>) = ap -- defined in Control.Monad ++ + instance Monad Result where +@@ -252,2 +261,9 @@ data OpResult a = OpFail FailMode -- ^ Failed operation + ++instance Functor OpResult where ++ fmap = liftM ++ ++instance Applicative OpResult where ++ pure = return ++ (<*>) = ap -- defined in Control.Monad ++ + instance Monad OpResult where diff --git a/app-emulation/ganeti-htools/ganeti-htools-0.3.1.ebuild b/app-emulation/ganeti-htools/ganeti-htools-0.3.1.ebuild index 251b669cc5a7..68482c2ee89c 100644 --- a/app-emulation/ganeti-htools/ganeti-htools-0.3.1.ebuild +++ b/app-emulation/ganeti-htools/ganeti-htools-0.3.1.ebuild @@ -33,6 +33,7 @@ src_prepare() { sed -i -e "s:) man:):" Makefile epatch "${FILESDIR}"/${PN}-0.2.8-use-QC-1.patch #316629 epatch "${FILESDIR}"/${PN}-0.3.1-base-4.patch #424299 + epatch "${FILESDIR}"/${PN}-0.3.1-ghc-7.10.patch } src_compile() { |