commit: f6ae36e783193e8b8c9a1f25ab15677c982ad186
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 4 21:55:16 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Aug 4 21:55:16 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6ae36e7
dev-haskell/top: tweak for ghc-8.8
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-haskell/top/files/top-1.7-ghc84.patch | 12 ++++++++++++
dev-haskell/top/top-1.7.ebuild | 11 ++++++-----
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/dev-haskell/top/files/top-1.7-ghc84.patch
b/dev-haskell/top/files/top-1.7-ghc84.patch
new file mode 100644
index 00000000000..58ed02d3ff2
--- /dev/null
+++ b/dev-haskell/top/files/top-1.7-ghc84.patch
@@ -0,0 +1,12 @@
+--- a/src/Top/Solver.hs
++++ b/src/Top/Solver.hs
+@@ -26,2 +26,3 @@ import Top.Constraint.Information
+ import Control.Monad.Writer
++import qualified Data.Semigroup as S
+
+@@ -170,2 +171,5 @@ evalBasicMonad = runWriter . flip evalStateFixT empty
+
++instance S.Semigroup LogEntries where
++ (<>) (LogEntries f) (LogEntries g) = LogEntries (f . g)
++
+ instance Monoid LogEntries where
diff --git a/dev-haskell/top/top-1.7.ebuild b/dev-haskell/top/top-1.7.ebuild
index 505c0ee09fb..f3d825ce4f6 100644
--- a/dev-haskell/top/top-1.7.ebuild
+++ b/dev-haskell/top/top-1.7.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
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${MY_P}"
-src_prepare() {
- epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-ghc-7.10.patch
+ "${FILESDIR}"/${P}-ghc84.patch
+)
