commit: b83efe1e00531db386b119fc00a13ab0353d9d8e Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Sun Dec 27 10:08:11 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Sun Dec 27 10:10:56 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b83efe1e
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 <AT> gentoo.org> .../linear/files/linear-1.20.9-base-orphans-0.8.3.patch | 13 +++++++++++++ dev-haskell/linear/linear-1.20.9.ebuild | 2 ++ 2 files changed, 15 insertions(+) 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 00000000000..c497de0b36a --- /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 ebf29418bf0..2a04c908112 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 \
