1 |
commit: 7f1b0fd76c276928b614a10e6e8cdba405c76722 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 14 19:32:42 2019 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 14 19:39:44 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f1b0fd7 |
7 |
|
8 |
dev-haskell/monadplus: bump up to 1.4.2-r1 |
9 |
|
10 |
Package-Manager: Portage-2.3.81, Repoman-2.3.20 |
11 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
12 |
|
13 |
.../monadplus/files/monadplus-1.4.2-ghc-8.4.patch | 33 ++++++++++++++++++++++ |
14 |
dev-haskell/monadplus/monadplus-1.4.2-r1.ebuild | 26 +++++++++++++++++ |
15 |
2 files changed, 59 insertions(+) |
16 |
|
17 |
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 |
18 |
new file mode 100644 |
19 |
index 00000000000..feebd15b06b |
20 |
--- /dev/null |
21 |
+++ b/dev-haskell/monadplus/files/monadplus-1.4.2-ghc-8.4.patch |
22 |
@@ -0,0 +1,33 @@ |
23 |
+From 63978a11cc1a512e564237e83060e9aa29ebce73 Mon Sep 17 00:00:00 2001 |
24 |
+From: =?UTF-8?q?Andr=C3=A9s=20Sicard-Ram=C3=ADrez?= <asr@×××××××××.co> |
25 |
+Date: Sun, 7 Jan 2018 23:52:32 -0500 |
26 |
+Subject: [PATCH] Added Semigroup instance. |
27 |
+ |
28 |
+The instance was required by GHC 8.4.1-alpha1. |
29 |
+--- |
30 |
+ src/Control/Monad/Plus.hs | 9 ++++++--- |
31 |
+ 1 file changed, 6 insertions(+), 3 deletions(-) |
32 |
+ |
33 |
+diff --git a/src/Control/Monad/Plus.hs b/src/Control/Monad/Plus.hs |
34 |
+index 25f4782..654d133 100644 |
35 |
+--- a/src/Control/Monad/Plus.hs |
36 |
++++ b/src/Control/Monad/Plus.hs |
37 |
+@@ -1,5 +1,5 @@ |
38 |
+ |
39 |
+-{-# LANGUAGE DeriveFunctor, DeriveFoldable, GeneralizedNewtypeDeriving #-} |
40 |
++{-# LANGUAGE CPP, DeriveFunctor, DeriveFoldable, GeneralizedNewtypeDeriving #-} |
41 |
+ |
42 |
+ ------------------------------------------------------------------------------------- |
43 |
+ -- | |
44 |
+@@ -263,6 +263,9 @@ instance Category Partial where |
45 |
+ |
46 |
+ instance Monoid (Partial a b) where |
47 |
+ mempty = mzero |
48 |
++#if !MIN_VERSION_base(4,11,0) |
49 |
+ mappend = mplus |
50 |
+- |
51 |
+- |
52 |
++#else |
53 |
++instance Semigroup (Partial a b) where |
54 |
++ (<>) = mappend |
55 |
++#endif |
56 |
|
57 |
diff --git a/dev-haskell/monadplus/monadplus-1.4.2-r1.ebuild b/dev-haskell/monadplus/monadplus-1.4.2-r1.ebuild |
58 |
new file mode 100644 |
59 |
index 00000000000..b5dbfd5ad98 |
60 |
--- /dev/null |
61 |
+++ b/dev-haskell/monadplus/monadplus-1.4.2-r1.ebuild |
62 |
@@ -0,0 +1,26 @@ |
63 |
+# Copyright 1999-2019 Gentoo Authors |
64 |
+# Distributed under the terms of the GNU General Public License v2 |
65 |
+ |
66 |
+EAPI=6 |
67 |
+ |
68 |
+# ebuild generated by hackport 0.4.6.9999 |
69 |
+ |
70 |
+CABAL_FEATURES="lib profile haddock hoogle hscolour" |
71 |
+inherit haskell-cabal |
72 |
+ |
73 |
+DESCRIPTION="Haskell98 partial maps and filters over MonadPlus" |
74 |
+HOMEPAGE="http://hackage.haskell.org/package/monadplus" |
75 |
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" |
76 |
+ |
77 |
+LICENSE="BSD" |
78 |
+SLOT="0/${PV}" |
79 |
+KEYWORDS="~amd64 ~x86" |
80 |
+IUSE="" |
81 |
+ |
82 |
+RDEPEND=">=dev-lang/ghc-7.4.1:= |
83 |
+" |
84 |
+DEPEND="${RDEPEND} |
85 |
+ >=dev-haskell/cabal-1.10 |
86 |
+" |
87 |
+ |
88 |
+PATCHES=("${FILESDIR}"/${P}-ghc-8.4.patch) |