Hello community, here is the log from the commit of package ghc-resourcet for openSUSE:Factory checked in at 2015-12-09 19:52:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-08-05 06:52:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-resourcet.new/ghc-resourcet.changes 2015-12-09 22:17:23.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Dec 7 11:25:07 UTC 2015 - [email protected] + +- update to 1.1.7 +* Canonicalise Monad instances + +------------------------------------------------------------------- Old: ---- resourcet-1.1.6.tar.gz New: ---- resourcet-1.1.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-resourcet.spec ++++++ --- /var/tmp/diff_new_pack.SWFEHz/_old 2015-12-09 22:17:24.000000000 +0100 +++ /var/tmp/diff_new_pack.SWFEHz/_new 2015-12-09 22:17:24.000000000 +0100 @@ -19,7 +19,7 @@ %global pkg_name resourcet Name: ghc-resourcet -Version: 1.1.6 +Version: 1.1.7 Release: 0 Summary: Deterministic allocation and freeing of scarce resources License: BSD-3-Clause ++++++ resourcet-1.1.6.tar.gz -> resourcet-1.1.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resourcet-1.1.6/ChangeLog.md new/resourcet-1.1.7/ChangeLog.md --- old/resourcet-1.1.6/ChangeLog.md 2015-07-31 06:16:49.000000000 +0200 +++ new/resourcet-1.1.7/ChangeLog.md 2015-11-29 17:12:13.000000000 +0100 @@ -1,3 +1,7 @@ +## 1.1.7 + +* Canonicalise Monad instances [#237](https://github.com/snoyberg/conduit/pull/237) + ## 1.1.6 * Safe/Trustworthy for resourcet [#220](https://github.com/snoyberg/conduit/pull/220) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resourcet-1.1.6/Control/Monad/Trans/Resource/Internal.hs new/resourcet-1.1.7/Control/Monad/Trans/Resource/Internal.hs --- old/resourcet-1.1.6/Control/Monad/Trans/Resource/Internal.hs 2015-07-31 06:16:49.000000000 +0200 +++ new/resourcet-1.1.7/Control/Monad/Trans/Resource/Internal.hs 2015-11-29 17:12:13.000000000 +0100 @@ -7,10 +7,12 @@ {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE UndecidableInstances #-} {-# LANGUAGE RankNTypes #-} --- Can only turn on SafeHaskell when using a newer GHC, otherwise we get build +-- Can only mark as Safe when using a newer GHC, otherwise we get build -- failures due to the manual Typeable instance below. #if __GLASGOW_HASKELL__ >= 707 {-# LANGUAGE Safe #-} +#else +{-# LANGUAGE Trustworthy #-} #endif module Control.Monad.Trans.Resource.Internal( @@ -237,7 +239,9 @@ (ResourceT mf) `mplus` (ResourceT ma) = ResourceT $ \r -> mf r `mplus` ma r instance Monad m => Monad (ResourceT m) where +#if !MIN_VERSION_base(4,8,0) return = ResourceT . const . return +#endif ResourceT ma >>= f = ResourceT $ \r -> do a <- ma r let ResourceT f' = f a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resourcet-1.1.6/Control/Monad/Trans/Resource.hs new/resourcet-1.1.7/Control/Monad/Trans/Resource.hs --- old/resourcet-1.1.6/Control/Monad/Trans/Resource.hs 2015-07-31 06:16:49.000000000 +0200 +++ new/resourcet-1.1.7/Control/Monad/Trans/Resource.hs 2015-11-29 17:12:13.000000000 +0100 @@ -10,9 +10,7 @@ #if __GLASGOW_HASKELL__ >= 704 {-# LANGUAGE ConstraintKinds #-} #endif -#if __GLASGOW_HASKELL__ >= 707 {-# LANGUAGE Safe #-} -#endif -- | Allocate resources which are guaranteed to be released. -- -- For more information, see <https://www.fpcomplete.com/user/snoyberg/library-documentation/resourcet>. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resourcet-1.1.6/Data/Acquire/Internal.hs new/resourcet-1.1.7/Data/Acquire/Internal.hs --- old/resourcet-1.1.6/Data/Acquire/Internal.hs 2015-07-31 06:16:49.000000000 +0200 +++ new/resourcet-1.1.7/Data/Acquire/Internal.hs 2015-11-29 17:12:13.000000000 +0100 @@ -53,11 +53,11 @@ instance Functor Acquire where fmap = liftM instance Applicative Acquire where - pure = return + pure a = Acquire (\_ -> return (Allocated a (const $ return ()))) (<*>) = ap instance Monad Acquire where - return a = Acquire (\_ -> return (Allocated a (const $ return ()))) + return = pure Acquire f >>= g' = Acquire $ \restore -> do Allocated x free1 <- f restore let Acquire g = g' x diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resourcet-1.1.6/Data/Acquire.hs new/resourcet-1.1.7/Data/Acquire.hs --- old/resourcet-1.1.6/Data/Acquire.hs 2015-07-31 06:16:49.000000000 +0200 +++ new/resourcet-1.1.7/Data/Acquire.hs 2015-11-29 17:12:13.000000000 +0100 @@ -1,7 +1,5 @@ {-# LANGUAGE CPP #-} -#if __GLASGOW_HASKELL__ >= 707 {-# LANGUAGE Safe #-} -#endif -- | This was previously known as the Resource monad. However, that term is -- confusing next to the ResourceT transformer, so it has been renamed. module Data.Acquire diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resourcet-1.1.6/resourcet.cabal new/resourcet-1.1.7/resourcet.cabal --- old/resourcet-1.1.6/resourcet.cabal 2015-07-31 06:16:49.000000000 +0200 +++ new/resourcet-1.1.7/resourcet.cabal 2015-11-29 17:12:13.000000000 +0100 @@ -1,5 +1,5 @@ Name: resourcet -Version: 1.1.6 +Version: 1.1.7 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
