summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2020-12-27 10:08:11 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2020-12-27 10:10:56 +0000
commitb83efe1e00531db386b119fc00a13ab0353d9d8e (patch)
tree139e52d4db7daa25a662d2ef30b15bf0ffdf18bd /dev-haskell
parentsys-libs/compiler-rt-sanitizers: Fix Darwin prefix paths (diff)
downloadgentoo-b83efe1e00531db386b119fc00a13ab0353d9d8e.tar.gz
gentoo-b83efe1e00531db386b119fc00a13ab0353d9d8e.tar.bz2
gentoo-b83efe1e00531db386b119fc00a13ab0353d9d8e.zip
dev-haskell/linear: allow new base-orphans-0.8
Reported-by: Toralf Förster Closes: https://bugs.gentoo.org/761820 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'dev-haskell')
-rw-r--r--dev-haskell/linear/files/linear-1.20.9-base-orphans-0.8.3.patch13
-rw-r--r--dev-haskell/linear/linear-1.20.9.ebuild2
2 files changed, 15 insertions, 0 deletions
diff --git a/dev-haskell/linear/files/linear-1.20.9-base-orphans-0.8.3.patch b/dev-haskell/linear/files/linear-1.20.9-base-orphans-0.8.3.patch
new file mode 100644
index 000000000000..c497de0b36a4
--- /dev/null
+++ b/dev-haskell/linear/files/linear-1.20.9-base-orphans-0.8.3.patch
@@ -0,0 +1,13 @@
+--- a/src/Linear/Instances.hs
++++ b/src/Linear/Instances.hs
+@@ -21,8 +21,10 @@ import Control.Monad.Zip
+ import Data.Complex
+ import Data.Orphans ()
+
++#if ! MIN_VERSION_base_orphans(0,8,3)
+ instance MonadZip Complex where
+ mzipWith = liftA2
+
+ instance MonadFix Complex where
+ mfix f = (let a :+ _ = f a in a) :+ (let _ :+ a = f a in a)
++#endif
diff --git a/dev-haskell/linear/linear-1.20.9.ebuild b/dev-haskell/linear/linear-1.20.9.ebuild
index ebf29418bf02..2a04c9081129 100644
--- a/dev-haskell/linear/linear-1.20.9.ebuild
+++ b/dev-haskell/linear/linear-1.20.9.ebuild
@@ -47,6 +47,8 @@ DEPEND="${RDEPEND}
>=dev-haskell/test-framework-hunit-0.3 )
"
+PATCHES=("${FILESDIR}"/${P}-base-orphans-0.8.3.patch)
+
src_configure() {
haskell-cabal_src_configure \
--flag=-herbie \