diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2019-12-14 19:32:42 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2019-12-14 19:39:44 +0000 |
| commit | 7f1b0fd76c276928b614a10e6e8cdba405c76722 (patch) | |
| tree | e7f964d305681942fb87f3c8ac89f5d9abfab8e6 | |
| parent | dev-haskell/mtl-compat: bump up to 0.2.2 (diff) | |
| download | gentoo-7f1b0fd76c276928b614a10e6e8cdba405c76722.tar.gz gentoo-7f1b0fd76c276928b614a10e6e8cdba405c76722.tar.bz2 gentoo-7f1b0fd76c276928b614a10e6e8cdba405c76722.zip | |
dev-haskell/monadplus: bump up to 1.4.2-r1
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
| -rw-r--r-- | dev-haskell/monadplus/files/monadplus-1.4.2-ghc-8.4.patch | 33 | ||||
| -rw-r--r-- | dev-haskell/monadplus/monadplus-1.4.2-r1.ebuild | 26 |
2 files changed, 59 insertions, 0 deletions
diff --git a/dev-haskell/monadplus/files/monadplus-1.4.2-ghc-8.4.patch b/dev-haskell/monadplus/files/monadplus-1.4.2-ghc-8.4.patch new file mode 100644 index 000000000000..feebd15b06b0 --- /dev/null +++ b/dev-haskell/monadplus/files/monadplus-1.4.2-ghc-8.4.patch @@ -0,0 +1,33 @@ +From 63978a11cc1a512e564237e83060e9aa29ebce73 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9s=20Sicard-Ram=C3=ADrez?= <asr@eafit.edu.co> +Date: Sun, 7 Jan 2018 23:52:32 -0500 +Subject: [PATCH] Added Semigroup instance. + +The instance was required by GHC 8.4.1-alpha1. +--- + src/Control/Monad/Plus.hs | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/src/Control/Monad/Plus.hs b/src/Control/Monad/Plus.hs +index 25f4782..654d133 100644 +--- a/src/Control/Monad/Plus.hs ++++ b/src/Control/Monad/Plus.hs +@@ -1,5 +1,5 @@ + +-{-# LANGUAGE DeriveFunctor, DeriveFoldable, GeneralizedNewtypeDeriving #-} ++{-# LANGUAGE CPP, DeriveFunctor, DeriveFoldable, GeneralizedNewtypeDeriving #-} + + ------------------------------------------------------------------------------------- + -- | +@@ -263,6 +263,9 @@ instance Category Partial where + + instance Monoid (Partial a b) where + mempty = mzero ++#if !MIN_VERSION_base(4,11,0) + mappend = mplus +- +- ++#else ++instance Semigroup (Partial a b) where ++ (<>) = mappend ++#endif diff --git a/dev-haskell/monadplus/monadplus-1.4.2-r1.ebuild b/dev-haskell/monadplus/monadplus-1.4.2-r1.ebuild new file mode 100644 index 000000000000..b5dbfd5ad984 --- /dev/null +++ b/dev-haskell/monadplus/monadplus-1.4.2-r1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +# ebuild generated by hackport 0.4.6.9999 + +CABAL_FEATURES="lib profile haddock hoogle hscolour" +inherit haskell-cabal + +DESCRIPTION="Haskell98 partial maps and filters over MonadPlus" +HOMEPAGE="http://hackage.haskell.org/package/monadplus" +SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=dev-lang/ghc-7.4.1:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.10 +" + +PATCHES=("${FILESDIR}"/${P}-ghc-8.4.patch) |