diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2020-10-24 11:08:57 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2020-10-24 11:09:27 +0100 |
| commit | 41c89ff6fe6bd28aef1a9d5e19a88962a750f1d7 (patch) | |
| tree | e8947f3f5e0a654d852a24212339e17676d87566 /dev-haskell/lvmlib | |
| parent | dev-haskell/logging-facade: drop old (diff) | |
| download | gentoo-41c89ff6fe6bd28aef1a9d5e19a88962a750f1d7.tar.gz gentoo-41c89ff6fe6bd28aef1a9d5e19a88962a750f1d7.tar.bz2 gentoo-41c89ff6fe6bd28aef1a9d5e19a88962a750f1d7.zip | |
dev-haskell/lvmlib: tweak for ghc-8.8
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'dev-haskell/lvmlib')
| -rw-r--r-- | dev-haskell/lvmlib/files/lvmlib-1.1-ghc-8.8.patch | 15 | ||||
| -rw-r--r-- | dev-haskell/lvmlib/files/lvmlib-1.1-ghc84.patch | 14 | ||||
| -rw-r--r-- | dev-haskell/lvmlib/lvmlib-1.1.ebuild | 12 |
3 files changed, 36 insertions, 5 deletions
diff --git a/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-8.8.patch b/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-8.8.patch new file mode 100644 index 000000000000..36d680794f07 --- /dev/null +++ b/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-8.8.patch @@ -0,0 +1,15 @@ +--- a/Lvm/Common/IdMap.hs ++++ b/Lvm/Common/IdMap.hs +@@ -121,10 +121,10 @@ unionMaps :: [IdMap a] -> IdMap a + unionMaps = foldr unionMap emptyMap + + foldMapWithId :: (Id -> a -> b -> b) -> b -> IdMap a -> b +-foldMapWithId f z (IdMap m) = IntMap.foldWithKey (f . idFromInt) z m ++foldMapWithId f z (IdMap m) = IntMap.foldrWithKey (f . idFromInt) z m + + foldMap :: (a -> b -> b) -> b -> IdMap a -> b +-foldMap f z (IdMap m) = IntMap.fold f z m ++foldMap f z (IdMap m) = IntMap.foldr f z m + + sizeMap :: IdMap a -> Int + sizeMap (IdMap m) = IntMap.size m diff --git a/dev-haskell/lvmlib/files/lvmlib-1.1-ghc84.patch b/dev-haskell/lvmlib/files/lvmlib-1.1-ghc84.patch new file mode 100644 index 000000000000..8f9e85402f9c --- /dev/null +++ b/dev-haskell/lvmlib/files/lvmlib-1.1-ghc84.patch @@ -0,0 +1,14 @@ +--- a/Lvm/Common/Byte.hs ++++ b/Lvm/Common/Byte.hs +@@ -19,2 +19,3 @@ import System.Exit + import System.IO ++import qualified Data.Semigroup as S + +@@ -68,2 +69,7 @@ max32 = 2^(32::Int) -1 -- Bastiaan (Todo: check) + ++instance S.Semigroup Bytes where ++ (<>) bs Nil = bs ++ (<>) Nil cs = cs ++ (<>) bs cs = Cat bs cs ++ + instance Monoid Bytes where diff --git a/dev-haskell/lvmlib/lvmlib-1.1.ebuild b/dev-haskell/lvmlib/lvmlib-1.1.ebuild index 9512fb153ec8..7184d226bf02 100644 --- a/dev-haskell/lvmlib/lvmlib-1.1.ebuild +++ b/dev-haskell/lvmlib/lvmlib-1.1.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.4.4.9999 @@ -25,6 +25,8 @@ DEPEND="${RDEPEND} >=dev-haskell/cabal-1.10.1.0 " -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.1-ghc-7.10.patch -} +PATCHES=( + "${FILESDIR}"/${PN}-1.1-ghc-7.10.patch + "${FILESDIR}"/${PN}-1.1-ghc84.patch + "${FILESDIR}"/${PN}-1.1-ghc-8.8.patch +) |