diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-haskell/lifted-async/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.xz |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-haskell/lifted-async/files')
-rw-r--r-- | dev-haskell/lifted-async/files/lifted-async-0.2.0.2-monad-control-1.1.patch | 69 |
1 files changed, 69 insertions, 0 deletions
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 new file mode 100644 index 00000000000..970d9842f77 --- /dev/null +++ b/dev-haskell/lifted-async/files/lifted-async-0.2.0.2-monad-control-1.1.patch @@ -0,0 +1,69 @@ +commit 448176aa98e03a31121501af004d8159e92b2f66 +Author: Roman Cheplyaka <roma@ro-che.info> +Date: Tue Dec 16 12:09:52 2014 +0200 + + Make lifted-async build with monad-control-1.0 + +diff --git a/src/Control/Concurrent/Async/Lifted.hs b/src/Control/Concurrent/Async/Lifted.hs +index fa5a158..e5034c1 100644 +--- a/src/Control/Concurrent/Async/Lifted.hs ++++ b/src/Control/Concurrent/Async/Lifted.hs +@@ -2,6 +2,7 @@ + {-# LANGUAGE KindSignatures #-} + {-# LANGUAGE RankNTypes #-} + {-# LANGUAGE TypeFamilies #-} ++{-# LANGUAGE ScopedTypeVariables #-} + + {- | + Module : Control.Concurrent.Async.Lifted +@@ -47,7 +48,7 @@ module Control.Concurrent.Async.Lifted + + import Control.Applicative + import Control.Concurrent (threadDelay) +-import Control.Monad ((>=>), forever, liftM, void) ++import Control.Monad ((>=>), forever, liftM) + import Data.Traversable (Traversable(..)) + import GHC.IO (unsafeUnmask) + import Prelude hiding (mapM) +@@ -180,11 +181,11 @@ waitCatch + waitCatch a = liftBase (A.waitCatch a) >>= sequenceEither + + -- | Generalized version of 'A.cancel'. +-cancel :: MonadBase IO m => Async (StM m a) -> m () ++cancel :: MonadBase IO m => Async a -> m () + cancel = liftBase . A.cancel + + -- | Generalized version of 'A.cancelWith'. +-cancelWith :: (MonadBase IO m, Exception e) => Async (StM m a) -> e -> m () ++cancelWith :: (MonadBase IO m, Exception e) => Async a -> e -> m () + cancelWith = (liftBase .) . A.cancelWith + + -- | Generalized version of 'A.waitAny'. +@@ -261,10 +262,10 @@ waitEitherCatchCancel a b = + -- | Generalized version of 'A.waitEither_'. + waitEither_ + :: MonadBaseControl IO m +- => Async (StM m a) +- -> Async (StM m b) ++ => Async a ++ -> Async b + -> m () +-waitEither_ = (void .) . waitEither ++waitEither_ a b = liftBase (A.waitEither_ a b) + + -- | Generalized version of 'A.waitBoth'. + waitBoth +@@ -280,11 +281,11 @@ waitBoth a b = do + {-# INLINABLE waitBoth #-} + + -- | Generalized version of 'A.link'. +-link :: MonadBase IO m => Async (StM m a) -> m () ++link :: MonadBase IO m => Async a -> m () + link = liftBase . A.link + + -- | Generalized version of 'A.link2'. +-link2 :: MonadBase IO m => Async (StM m a) -> Async (StM m b) -> m () ++link2 :: MonadBase IO m => Async a -> Async a -> m () + link2 = (liftBase .) . A.link2 + + -- | Generalized version of 'A.race'. |