Hello community, here is the log from the commit of package ghc-resourcet for openSUSE:Factory checked in at 2015-05-26 12:36:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-resourcet (Old) and /work/SRC/openSUSE:Factory/.ghc-resourcet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-resourcet" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-resourcet/ghc-resourcet.changes 2015-05-21 08:12:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-resourcet.new/ghc-resourcet.changes 2015-05-26 12:36:44.000000000 +0200 @@ -1,0 +2,6 @@ +Tue May 26 08:54:43 UTC 2015 - [email protected] + +- update to 1.1.5 +* Add pass-through instances for Alternative and MonadPlus + +------------------------------------------------------------------- Old: ---- resourcet-1.1.4.1.tar.gz New: ---- resourcet-1.1.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-resourcet.spec ++++++ --- /var/tmp/diff_new_pack.VsQ1cq/_old 2015-05-26 12:36:45.000000000 +0200 +++ /var/tmp/diff_new_pack.VsQ1cq/_new 2015-05-26 12:36:45.000000000 +0200 @@ -19,14 +19,14 @@ %global pkg_name resourcet Name: ghc-resourcet -Version: 1.1.4.1 +Version: 1.1.5 Release: 0 Summary: Deterministic allocation and freeing of scarce resources License: BSD-3-Clause Group: System/Libraries Url: http://hackage.haskell.org/package/%{pkg_name} -Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz +Source0: http://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ghc-Cabal-devel ++++++ resourcet-1.1.4.1.tar.gz -> resourcet-1.1.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resourcet-1.1.4.1/ChangeLog.md new/resourcet-1.1.5/ChangeLog.md --- old/resourcet-1.1.4.1/ChangeLog.md 2015-02-17 06:44:51.000000000 +0100 +++ new/resourcet-1.1.5/ChangeLog.md 2015-05-17 12:56:36.000000000 +0200 @@ -1,3 +1,7 @@ +## 1.1.5 + +* Add pass-through instances for Alternative and MonadPlus [#214](https://github.com/snoyberg/conduit/pull/214) + ## 1.1.4.1 * Allow older `exceptions` version again diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resourcet-1.1.4.1/Control/Monad/Trans/Resource/Internal.hs new/resourcet-1.1.5/Control/Monad/Trans/Resource/Internal.hs --- old/resourcet-1.1.4.1/Control/Monad/Trans/Resource/Internal.hs 2015-02-17 06:44:51.000000000 +0100 +++ new/resourcet-1.1.5/Control/Monad/Trans/Resource/Internal.hs 2015-05-17 12:56:36.000000000 +0200 @@ -23,7 +23,8 @@ ) where import Control.Exception (throw,Exception,SomeException) -import Control.Applicative (Applicative (..)) +import Control.Applicative (Applicative (..), Alternative(..)) +import Control.Monad (MonadPlus(..)) import Control.Monad.Trans.Control ( MonadTransControl (..), MonadBaseControl (..) ) import Control.Monad.Base (MonadBase, liftBase) @@ -235,6 +236,16 @@ ResourceT mf <*> ResourceT ma = ResourceT $ \r -> mf r <*> ma r +-- | Since 1.1.5 +instance Alternative m => Alternative (ResourceT m) where + empty = ResourceT $ \_ -> empty + (ResourceT mf) <|> (ResourceT ma) = ResourceT $ \r -> mf r <|> ma r + +-- | Since 1.1.5 +instance MonadPlus m => MonadPlus (ResourceT m) where + mzero = ResourceT $ \_ -> mzero + (ResourceT mf) `mplus` (ResourceT ma) = ResourceT $ \r -> mf r `mplus` ma r + instance Monad m => Monad (ResourceT m) where return = ResourceT . const . return ResourceT ma >>= f = ResourceT $ \r -> do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resourcet-1.1.4.1/resourcet.cabal new/resourcet-1.1.5/resourcet.cabal --- old/resourcet-1.1.4.1/resourcet.cabal 2015-02-17 06:44:51.000000000 +0100 +++ new/resourcet-1.1.5/resourcet.cabal 2015-05-17 12:56:36.000000000 +0200 @@ -1,5 +1,5 @@ Name: resourcet -Version: 1.1.4.1 +Version: 1.1.5 Synopsis: Deterministic allocation and freeing of scarce resources. description: Hackage documentation generation is not reliable. For up to date documentation, please see: <http://www.stackage.org/package/resourcet>. License: BSD3 @@ -17,7 +17,7 @@ Control.Monad.Trans.Resource.Internal Data.Acquire Data.Acquire.Internal - Build-depends: base >= 4.3 && < 5 + Build-depends: base >= 4.5 && < 5 , lifted-base >= 0.1 , transformers-base >= 0.4.4 && < 0.5 , monad-control >= 0.3.1 && < 1.1
