summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2016-02-20 20:49:31 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2016-02-20 20:49:44 +0000
commit7872e19528754d72cbe55b6bd80e4ca9e91be094 (patch)
treeb2bccd6135b725ffb11691d5ae677c0751c87607 /dev-haskell/classy-prelude
parentdev-go/go-crypto: version bump to 0_pre20160126 (diff)
downloadgentoo-7872e19528754d72cbe55b6bd80e4ca9e91be094.tar.gz
gentoo-7872e19528754d72cbe55b6bd80e4ca9e91be094.tar.bz2
gentoo-7872e19528754d72cbe55b6bd80e4ca9e91be094.zip
dev-haskell/classy-prelude: fix build failure, bug #575244
mono-traversable-0.9.3 introduces it's own intercalate. Reported-by: Toralf Förster Bug: https://bugs.gentoo.org/575244 Package-Manager: portage-2.2.27
Diffstat (limited to 'dev-haskell/classy-prelude')
-rw-r--r--dev-haskell/classy-prelude/classy-prelude-0.12.0.ebuild4
-rw-r--r--dev-haskell/classy-prelude/files/classy-prelude-0.12.0-mt-0.9.3.patch10
2 files changed, 14 insertions, 0 deletions
diff --git a/dev-haskell/classy-prelude/classy-prelude-0.12.0.ebuild b/dev-haskell/classy-prelude/classy-prelude-0.12.0.ebuild
index 84067ab795cd..4199cbc2aa56 100644
--- a/dev-haskell/classy-prelude/classy-prelude-0.12.0.ebuild
+++ b/dev-haskell/classy-prelude/classy-prelude-0.12.0.ebuild
@@ -45,3 +45,7 @@ DEPEND="${RDEPEND}
test? ( >=dev-haskell/hspec-1.3
dev-haskell/quickcheck )
"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-mt-0.9.3.patch
+}
diff --git a/dev-haskell/classy-prelude/files/classy-prelude-0.12.0-mt-0.9.3.patch b/dev-haskell/classy-prelude/files/classy-prelude-0.12.0-mt-0.9.3.patch
new file mode 100644
index 000000000000..17cddcd3975c
--- /dev/null
+++ b/dev-haskell/classy-prelude/files/classy-prelude-0.12.0-mt-0.9.3.patch
@@ -0,0 +1,10 @@
+https://bugs.gentoo.org/575244
+diff --git a/ClassyPrelude.hs b/ClassyPrelude.hs
+index a6c0db4..27173aa 100644
+--- a/ClassyPrelude.hs
++++ b/ClassyPrelude.hs
+@@ -193,3 +193,3 @@ import Data.ChunkedZip
+ import qualified Data.Char as Char
+-import Data.Sequences hiding (elem)
++import Data.Sequences hiding (elem, intercalate)
+ import Data.MonoTraversable