diff options
Diffstat (limited to 'dev-haskell/hps')
| -rw-r--r-- | dev-haskell/hps/Manifest | 3 | ||||
| -rw-r--r-- | dev-haskell/hps/files/hps-0.15-ghc84.patch | 28 | ||||
| -rw-r--r-- | dev-haskell/hps/hps-0.15.ebuild | 4 |
3 files changed, 34 insertions, 1 deletions
diff --git a/dev-haskell/hps/Manifest b/dev-haskell/hps/Manifest index d7ab1ae39ab0..b041566c203d 100644 --- a/dev-haskell/hps/Manifest +++ b/dev-haskell/hps/Manifest @@ -1,3 +1,4 @@ +AUX hps-0.15-ghc84.patch 945 BLAKE2B 7c6343384102a3dc24f1269f3c58dfba3432de2ecf9a9abb34b88aff5d9c03819cde7d1beddb8989a5d8b85ec2c9b1068ab9d61261dbf5f1cdf0211df3f16920 SHA512 ce969896dd4d3c1ed44998f2864a4bbb0e5b18f055a2925c4553c2ffb596ac07edead193beb7307eb352dacdd5a9963fde7ff245cb0773d8107b0cb1955b24f9 DIST hps-0.15.tar.gz 12111 BLAKE2B 24dc23e3315f69bab6975b4b091c026c91a478b6d9c4cf220d4cea527a72522b0ef17dceeab5d7907c9f598268d2e1e7dfcd4849740615bdfa0667fe936c9738 SHA512 19b86161b46d523357863acbbdc8b7311e9f6b286429dbf1f56e044ced578d7c7026315d02b50ef831b3bce412ca623082956039181e832fb766e30729ea27c6 -EBUILD hps-0.15.ebuild 751 BLAKE2B c938a8d8fefb5c1d426ab77eb9a41604b775c665d656a9679ea312c24fb52bf1ec719ba4c299c742a256e3d8ccee92002aaa531e511af6e1a41d830dfc9ec2b7 SHA512 4d41e68fce814d058cb0302013c13062f5a45364ba6287dd588c5a92731991108b64db79770c6e006ea5d586d2e8c75d5d9671bbe9866776963907d1b916e53b +EBUILD hps-0.15.ebuild 796 BLAKE2B 5ee34f90c39e76dc94d4d34b8594e6ad55e6cdb26ca8f872e3b80c72ea8c07f776e72defde30b00b342ffc6cdda568014f9cce92807543b709a4a6310bb8ff85 SHA512 8e0583f9037f3cdd4c963e463fa54fd4c46760d0c927da8cc2708b397fd4038162363216c3661f241a00387d28d4597f12075c8658b9cb44f78938025da3f9e0 MISC metadata.xml 445 BLAKE2B 9f80506c0b02afedfc8fb4b897d8cf6e217a5d7962920ee4c7825fd4e1863d73c5cfaa24907cba982dcdb6f7af320e1c27e3c6eeef37fd960851338941b9249a SHA512 e71f6cbd322644db836bf7cf5fc6056db4e0f744aa58a3acb62bdd6ecbb62955945ad693c618352a6b18133fe314a7161d86e0fdb8439265259dbf673d4dad03 diff --git a/dev-haskell/hps/files/hps-0.15-ghc84.patch b/dev-haskell/hps/files/hps-0.15-ghc84.patch new file mode 100644 index 000000000000..cbc67705459a --- /dev/null +++ b/dev-haskell/hps/files/hps-0.15-ghc84.patch @@ -0,0 +1,28 @@ +--- a/Graphics/PS/PS.hs ++++ b/Graphics/PS/PS.hs +@@ -14,2 +14,3 @@ import qualified Graphics.PS.Paper as P + import qualified Graphics.PS.Image as I ++import qualified Data.Semigroup as S + +@@ -248,2 +249,6 @@ newtype MonadMonoid m = MonadMonoid {appMonadMonoid :: m ()} + ++instance Monad m => S.Semigroup (MonadMonoid m) where ++ (<>) (MonadMonoid a) (MonadMonoid b) = ++ MonadMonoid (a >> b) ++ + instance Monad m => Monoid (MonadMonoid m) where +--- a/Graphics/PS/Statistics.hs ++++ b/Graphics/PS/Statistics.hs +@@ -6,2 +6,3 @@ import Graphics.PS.Image + import Graphics.PS.Path ++import qualified Data.Semigroup as S + +@@ -16,2 +17,8 @@ data Statistics = Statistics {nMoveTo :: Integer + ++instance S.Semigroup Statistics where ++ (<>) p q = ++ let (Statistics m1 l1 c1 f1 g1 t1) = p ++ (Statistics m2 l2 c2 f2 g2 t2) = q ++ in Statistics (m1+m2) (l1+l2) (c1+c2) (f1+f2) (g1+g2) (t1+t2) ++ + instance Monoid Statistics where diff --git a/dev-haskell/hps/hps-0.15.ebuild b/dev-haskell/hps/hps-0.15.ebuild index 672d8d90b532..ca36c1bdc7f8 100644 --- a/dev-haskell/hps/hps-0.15.ebuild +++ b/dev-haskell/hps/hps-0.15.ebuild @@ -25,6 +25,10 @@ DEPEND="${RDEPEND} >=dev-haskell/cabal-1.8 " +PATCHES=( + "${FILESDIR}"/${P}-ghc84.patch +) + src_configure() { haskell-cabal_src_configure \ $(cabal_flag build-exec build-exec) |