diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
| commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
| tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-haskell/enumerator | |
| parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) | |
gentoo resync : 25.08.2020
Diffstat (limited to 'dev-haskell/enumerator')
| -rw-r--r-- | dev-haskell/enumerator/Manifest | 3 | ||||
| -rw-r--r-- | dev-haskell/enumerator/enumerator-0.4.20.ebuild | 8 | ||||
| -rw-r--r-- | dev-haskell/enumerator/files/enumerator-0.4.20-ghc84.patch | 21 |
3 files changed, 29 insertions, 3 deletions
diff --git a/dev-haskell/enumerator/Manifest b/dev-haskell/enumerator/Manifest index d6e6e24e9e19..95decbd525c6 100644 --- a/dev-haskell/enumerator/Manifest +++ b/dev-haskell/enumerator/Manifest @@ -1,3 +1,4 @@ +AUX enumerator-0.4.20-ghc84.patch 590 BLAKE2B eb079893035685d0dcc19f1bf1ec3e7002c21ada581d8b8002d1d1713e575de8aa79dd98dfa677cdc51f9829cb7695ef67c61f73e65042c8a848ffb113724243 SHA512 f38d940bc8998c74cdc7f926a055c73940df32950d4934a5533a9495b69e8cdf28882f8dc54413c8e1095c3584802c0ef73f276ed5dc2d5609b77e4c18dfecfb DIST enumerator-0.4.20.tar.gz 53986 BLAKE2B dcb98c31e862194f712c2fe23193557c837d5ba658b89ea50005c2e62d2080d06740793fd4e4629d8dab5000062ef2e3908fea7071ca499e8a2e3f7ca0c1d085 SHA512 90711142b61cee2184420f4d5c9de9563afe6198cccbf5d9d8a75253b307c3df9fee388dc7770e8151f8d7b5570afdb30d8e4e597ce462302dda8430e64050ad -EBUILD enumerator-0.4.20.ebuild 659 BLAKE2B 074333915a0ace0f2d8abd2d4fa126cfd6eca41cd2870bf1514719c03ac21a9d95f3bdc8f57249daad66f3e2f8da3d4b7621e88d2b54375a71ec181674f40632 SHA512 4219e723f674042a60983861bda6f459f354201000b15f4f1f04633703f9d7cb5b6dc0c9ac7dae69d2afaf4f3c621202718ba755a9d7650f9e698c83cb9c2ae5 +EBUILD enumerator-0.4.20.ebuild 704 BLAKE2B 800b641f1dbcd164fe68968eaa6c4c4708c1b82f37a991886e38d0f43916b3defebed26bf59b14f41f7ada2338fc35d0c283531b8ff0b18500f1200155d46f15 SHA512 fb49ddea4dbd8ae954b4c2ac00b4807d8dc6becef4d80595f4f6d80207dda6eecb2363b2afdcd1d804905caee52c4b6ca0df3e5286ff86034fa23add01c9ab15 MISC metadata.xml 2363 BLAKE2B ad70878e500caef88e6553e1c5954c424fc4fa26c8c7ad7ea9342ceaf14bd3721ecb05a91b2f586c09531bfd466bd92f6091de9319316679133c6c39a3f4f528 SHA512 94791c84968b175f7a28590522a264efc960277a56a61d18305d0e944b48d7e0b38f40f97932a152e5d501315c514e9db36cb9b36464045c65d5f07dd1ca9b16 diff --git a/dev-haskell/enumerator/enumerator-0.4.20.ebuild b/dev-haskell/enumerator/enumerator-0.4.20.ebuild index 135477c4a952..c8d35ee60ce3 100644 --- a/dev-haskell/enumerator/enumerator-0.4.20.ebuild +++ b/dev-haskell/enumerator/enumerator-0.4.20.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 # ebuild generated by hackport 0.3.4.9999 @@ -24,3 +24,7 @@ RDEPEND=">=dev-haskell/text-0.7:=[profile?] DEPEND="${RDEPEND} >=dev-haskell/cabal-1.6.0.3 " + +PATCHES=( + "${FILESDIR}"/${P}-ghc84.patch +) diff --git a/dev-haskell/enumerator/files/enumerator-0.4.20-ghc84.patch b/dev-haskell/enumerator/files/enumerator-0.4.20-ghc84.patch new file mode 100644 index 000000000000..d992228d2e5c --- /dev/null +++ b/dev-haskell/enumerator/files/enumerator-0.4.20-ghc84.patch @@ -0,0 +1,21 @@ +--- a/enumerator.cabal ++++ b/enumerator.cabal +@@ -152,2 +152,5 @@ library + ++ if !impl(ghc >= 8.0) ++ build-depends: semigroups == 0.18.* ++ + exposed-modules: +--- a/lib/Data/Enumerator/Internal.hs ++++ b/lib/Data/Enumerator/Internal.hs +@@ -50,2 +50,3 @@ import Data.Function (fix) + import Data.Monoid (Monoid, mempty, mappend, mconcat) ++import qualified Data.Semigroup as S + +@@ -73,2 +74,6 @@ instance Monad Stream where + ++instance S.Semigroup (Stream a) where ++ (<>) (Chunks xs) (Chunks ys) = Chunks (xs ++ ys) ++ (<>) _ _ = EOF ++ + instance Monoid (Stream a) where |