summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-haskell/shelly/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
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/shelly/files')
-rw-r--r--dev-haskell/shelly/files/shelly-1.5.6-monad-control-1.1.patch95
1 files changed, 95 insertions, 0 deletions
diff --git a/dev-haskell/shelly/files/shelly-1.5.6-monad-control-1.1.patch b/dev-haskell/shelly/files/shelly-1.5.6-monad-control-1.1.patch
new file mode 100644
index 000000000000..a2ef39376c08
--- /dev/null
+++ b/dev-haskell/shelly/files/shelly-1.5.6-monad-control-1.1.patch
@@ -0,0 +1,95 @@
+commit 33b32439e7ef1ba60cc8d72ae0f0c53b6d01ae90
+Merge: d3aec33 b70a308
+Author: Greg Weber <greg@gregweber.info>
+Date: Mon Dec 22 10:32:40 2014 -0800
+
+ Merge pull request #84 from yesodweb/monad-control-1.0
+
+ monad-control 1.0
+
+commit d3aec338e23a03027c404aaf5a7b5790b3300ec5
+Author: Luite Stegeman <stegeman@gmail.com>
+Date: Mon Dec 22 16:21:01 2014 +0100
+
+ bump time upper bound
+
+diff --git a/shelly.cabal b/shelly.cabal
+index ed0d086..3d3c46d 100644
+--- a/shelly.cabal
++++ b/shelly.cabal
+@@ -39,7 +39,7 @@ Library
+
+ Build-depends:
+ containers >= 0.4.2.0,
+- time >= 1.3 && < 1.5,
++ time >= 1.3 && < 1.6,
+ directory >= 1.1.0.0 && < 1.3.0.0,
+ mtl >= 2,
+ process >= 1.0,
+
+commit c1da49fb0d59a56c9e4140a5cbf0700c9fc1ca5f
+Author: Luite Stegeman <stegeman@gmail.com>
+Date: Mon Dec 22 16:20:18 2014 +0100
+
+ Add Alternative instance for Sh, since it's now a superclass of
+ MonadPlus.
+
+diff --git a/src/Shelly/Pipe.hs b/src/Shelly/Pipe.hs
+index a8d0182..f0a64ec 100644
+--- a/src/Shelly/Pipe.hs
++++ b/src/Shelly/Pipe.hs
+@@ -138,6 +138,10 @@ instance Applicative Sh where
+ pure = return
+ (<*>) = ap
+
++instance Alternative Sh where
++ empty = mzero
++ (<|>) = mplus
++
+ instance MonadPlus Sh where
+ mzero = Sh $ return []
+ mplus a b = Sh $ liftA2 (++) (unSh a) (unSh b)
+
+commit b70a308ad14af0b57bbdd9cf8441bdc30ff65c36
+Author: Michael Snoyman <michael@snoyman.com>
+Date: Mon Dec 22 13:49:54 2014 +0200
+
+ monad-control 1.0
+
+diff --git a/shelly.cabal b/shelly.cabal
+index ed0d086..99a85d3 100644
+--- a/shelly.cabal
++++ b/shelly.cabal
+@@ -46,7 +46,7 @@ Library
+ unix-compat < 0.5,
+ system-filepath >= 0.4.7 && < 0.5,
+ system-fileio < 0.4,
+- monad-control >= 0.3.2 && < 0.4,
++ monad-control >= 0.3.2 && < 1.1,
+ lifted-base,
+ lifted-async,
+ exceptions == 0.6.*,
+diff --git a/src/Shelly/Base.hs b/src/Shelly/Base.hs
+index e05ad43..3d6fe00 100644
+--- a/src/Shelly/Base.hs
++++ b/src/Shelly/Base.hs
+@@ -71,11 +71,19 @@ instance MonadBase IO Sh where
+ liftBase = Sh . ReaderT . const
+
+ instance MonadBaseControl IO Sh where
++#if MIN_VERSION_monad_control(1,0,0)
++ type StM Sh a = StM (ReaderT (IORef State) IO) a
++ liftBaseWith f =
++ Sh $ liftBaseWith $ \runInBase -> f $ \k ->
++ runInBase $ unSh k
++ restoreM = Sh . restoreM
++#else
+ newtype StM Sh a = StMSh (StM (ReaderT (IORef State) IO) a)
+ liftBaseWith f =
+ Sh $ liftBaseWith $ \runInBase -> f $ \k ->
+ liftM StMSh $ runInBase $ unSh k
+ restoreM (StMSh m) = Sh . restoreM $ m
++#endif
+
+ instance Catch.MonadThrow Sh where
+ throwM = liftIO . Catch.throwM