From 7872e19528754d72cbe55b6bd80e4ca9e91be094 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 20 Feb 2016 20:49:31 +0000 Subject: dev-haskell/classy-prelude: fix build failure, bug #575244 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- dev-haskell/classy-prelude/classy-prelude-0.12.0.ebuild | 4 ++++ .../classy-prelude/files/classy-prelude-0.12.0-mt-0.9.3.patch | 10 ++++++++++ 2 files changed, 14 insertions(+) create mode 100644 dev-haskell/classy-prelude/files/classy-prelude-0.12.0-mt-0.9.3.patch (limited to 'dev-haskell/classy-prelude') 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 84067ab795c..4199cbc2aa5 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 00000000000..17cddcd3975 --- /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 -- cgit v1.2.1