Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-haskell/lifted-async/files/
Date: Mon, 14 Sep 2020 07:05:49
Message-Id: 1600067140.0d1e2a0c6e3a907d5dc33aefa6b79f2300637572.slyfox@gentoo
1 commit: 0d1e2a0c6e3a907d5dc33aefa6b79f2300637572
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sun Sep 13 12:58:09 2020 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 14 07:05:40 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d1e2a0c
7
8 dev-haskell/lifted-async: remove unused patch(es)
9
10 Package-Manager: Portage-3.0.6, Repoman-3.0.1
11 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
12 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
13
14 .../lifted-async-0.2.0.2-monad-control-1.1.patch | 69 ----------------------
15 1 file changed, 69 deletions(-)
16
17 diff --git a/dev-haskell/lifted-async/files/lifted-async-0.2.0.2-monad-control-1.1.patch b/dev-haskell/lifted-async/files/lifted-async-0.2.0.2-monad-control-1.1.patch
18 deleted file mode 100644
19 index 970d9842f77..00000000000
20 --- a/dev-haskell/lifted-async/files/lifted-async-0.2.0.2-monad-control-1.1.patch
21 +++ /dev/null
22 @@ -1,69 +0,0 @@
23 -commit 448176aa98e03a31121501af004d8159e92b2f66
24 -Author: Roman Cheplyaka <roma@××××××.info>
25 -Date: Tue Dec 16 12:09:52 2014 +0200
26 -
27 - Make lifted-async build with monad-control-1.0
28 -
29 -diff --git a/src/Control/Concurrent/Async/Lifted.hs b/src/Control/Concurrent/Async/Lifted.hs
30 -index fa5a158..e5034c1 100644
31 ---- a/src/Control/Concurrent/Async/Lifted.hs
32 -+++ b/src/Control/Concurrent/Async/Lifted.hs
33 -@@ -2,6 +2,7 @@
34 - {-# LANGUAGE KindSignatures #-}
35 - {-# LANGUAGE RankNTypes #-}
36 - {-# LANGUAGE TypeFamilies #-}
37 -+{-# LANGUAGE ScopedTypeVariables #-}
38 -
39 - {- |
40 - Module : Control.Concurrent.Async.Lifted
41 -@@ -47,7 +48,7 @@ module Control.Concurrent.Async.Lifted
42 -
43 - import Control.Applicative
44 - import Control.Concurrent (threadDelay)
45 --import Control.Monad ((>=>), forever, liftM, void)
46 -+import Control.Monad ((>=>), forever, liftM)
47 - import Data.Traversable (Traversable(..))
48 - import GHC.IO (unsafeUnmask)
49 - import Prelude hiding (mapM)
50 -@@ -180,11 +181,11 @@ waitCatch
51 - waitCatch a = liftBase (A.waitCatch a) >>= sequenceEither
52 -
53 - -- | Generalized version of 'A.cancel'.
54 --cancel :: MonadBase IO m => Async (StM m a) -> m ()
55 -+cancel :: MonadBase IO m => Async a -> m ()
56 - cancel = liftBase . A.cancel
57 -
58 - -- | Generalized version of 'A.cancelWith'.
59 --cancelWith :: (MonadBase IO m, Exception e) => Async (StM m a) -> e -> m ()
60 -+cancelWith :: (MonadBase IO m, Exception e) => Async a -> e -> m ()
61 - cancelWith = (liftBase .) . A.cancelWith
62 -
63 - -- | Generalized version of 'A.waitAny'.
64 -@@ -261,10 +262,10 @@ waitEitherCatchCancel a b =
65 - -- | Generalized version of 'A.waitEither_'.
66 - waitEither_
67 - :: MonadBaseControl IO m
68 -- => Async (StM m a)
69 -- -> Async (StM m b)
70 -+ => Async a
71 -+ -> Async b
72 - -> m ()
73 --waitEither_ = (void .) . waitEither
74 -+waitEither_ a b = liftBase (A.waitEither_ a b)
75 -
76 - -- | Generalized version of 'A.waitBoth'.
77 - waitBoth
78 -@@ -280,11 +281,11 @@ waitBoth a b = do
79 - {-# INLINABLE waitBoth #-}
80 -
81 - -- | Generalized version of 'A.link'.
82 --link :: MonadBase IO m => Async (StM m a) -> m ()
83 -+link :: MonadBase IO m => Async a -> m ()
84 - link = liftBase . A.link
85 -
86 - -- | Generalized version of 'A.link2'.
87 --link2 :: MonadBase IO m => Async (StM m a) -> Async (StM m b) -> m ()
88 -+link2 :: MonadBase IO m => Async a -> Async a -> m ()
89 - link2 = (liftBase .) . A.link2
90 -
91 - -- | Generalized version of 'A.race'.