Hello community, here is the log from the commit of package ghc-conduit for openSUSE:Factory checked in at 2016-05-17 17:14:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-conduit (Old) and /work/SRC/openSUSE:Factory/.ghc-conduit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-conduit" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-conduit/ghc-conduit.changes 2016-03-16 10:36:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-conduit.new/ghc-conduit.changes 2016-05-17 17:14:32.000000000 +0200 @@ -1,0 +2,7 @@ +Sat May 7 06:19:42 UTC 2016 - mimi...@gmail.com + +- update to 1.2.6.6 +* Fix test suite compilation on older GHCs +* In zipConduitApp, left bias not respected mixing monadic and non-monadic conduits + +------------------------------------------------------------------- Old: ---- conduit-1.2.6.4.tar.gz New: ---- conduit-1.2.6.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-conduit.spec ++++++ --- /var/tmp/diff_new_pack.ai8y93/_old 2016-05-17 17:14:33.000000000 +0200 +++ /var/tmp/diff_new_pack.ai8y93/_new 2016-05-17 17:14:33.000000000 +0200 @@ -19,7 +19,7 @@ %global pkg_name conduit Name: ghc-conduit -Version: 1.2.6.4 +Version: 1.2.6.6 Release: 0 Summary: Streaming data processing library License: MIT ++++++ conduit-1.2.6.4.tar.gz -> conduit-1.2.6.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conduit-1.2.6.4/ChangeLog.md new/conduit-1.2.6.6/ChangeLog.md --- old/conduit-1.2.6.4/ChangeLog.md 2016-03-10 09:33:45.000000000 +0100 +++ new/conduit-1.2.6.6/ChangeLog.md 2016-05-05 14:29:07.000000000 +0200 @@ -1,3 +1,11 @@ +## 1.2.6.6 + +* Fix test suite compilation on older GHCs + +## 1.2.6.5 + +* In zipConduitApp, left bias not respected mixing monadic and non-monadic conduits [#263](https://github.com/snoyberg/conduit/pull/263) + ## 1.2.6.4 * Fix benchmark by adding a type signature diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conduit-1.2.6.4/Data/Conduit/Internal/Conduit.hs new/conduit-1.2.6.6/Data/Conduit/Internal/Conduit.hs --- old/conduit-1.2.6.4/Data/Conduit/Internal/Conduit.hs 2016-03-10 09:33:45.000000000 +0100 +++ new/conduit-1.2.6.6/Data/Conduit/Internal/Conduit.hs 2016-05-05 14:29:07.000000000 +0200 @@ -540,6 +540,8 @@ -> ConduitM i o m y zipConduitApp (ConduitM left0) (ConduitM right0) = ConduitM $ \rest -> let go _ _ (Done f) (Done x) = rest (f x) + go finalX finalY (PipeM mx) y = PipeM (flip (go finalX finalY) y `liftM` mx) + go finalX finalY x (PipeM my) = PipeM (go finalX finalY x `liftM` my) go _ finalY (HaveOutput x finalX o) y = HaveOutput (go finalX finalY x y) (finalX >> finalY) @@ -550,8 +552,6 @@ o go _ _ (Leftover _ i) _ = absurd i go _ _ _ (Leftover _ i) = absurd i - go finalX finalY (PipeM mx) y = PipeM (flip (go finalX finalY) y `liftM` mx) - go finalX finalY x (PipeM my) = PipeM (go finalX finalY x `liftM` my) go finalX finalY (NeedInput px cx) (NeedInput py cy) = NeedInput (\i -> go finalX finalY (px i) (py i)) (\u -> go finalX finalY (cx u) (cy u)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conduit-1.2.6.4/conduit.cabal new/conduit-1.2.6.6/conduit.cabal --- old/conduit-1.2.6.4/conduit.cabal 2016-03-10 09:33:45.000000000 +0100 +++ new/conduit-1.2.6.6/conduit.cabal 2016-05-05 14:29:07.000000000 +0200 @@ -1,5 +1,5 @@ Name: conduit -Version: 1.2.6.4 +Version: 1.2.6.6 Synopsis: Streaming data processing library. description: Hackage documentation generation is not reliable. For up to date documentation, please see: <http://www.stackage.org/package/conduit>. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conduit-1.2.6.4/test/Data/Conduit/Extra/ZipConduitSpec.hs new/conduit-1.2.6.6/test/Data/Conduit/Extra/ZipConduitSpec.hs --- old/conduit-1.2.6.4/test/Data/Conduit/Extra/ZipConduitSpec.hs 2016-03-10 09:33:45.000000000 +0100 +++ new/conduit-1.2.6.6/test/Data/Conduit/Extra/ZipConduitSpec.hs 2016-05-05 14:29:07.000000000 +0200 @@ -2,7 +2,7 @@ import Test.Hspec import Data.Conduit import qualified Data.Conduit.List as CL -import Control.Applicative ((<*)) +import Control.Applicative ((<*), pure) spec :: Spec spec = describe "Data.Conduit.Extra.ZipConduit" $ do @@ -24,3 +24,11 @@ sink = CL.consume res <- src $$ conduit =$ sink res `shouldBe` [2, 1, 1, 3, 2, 2, 4, 3, 3, 12] + it "ZipConduitMonad" $ do + let src = mapM_ yield [1..3 :: Int] + conduit1 = CL.mapM (pure . (+1)) + conduit2 = CL.map id + conduit = getZipConduit $ ZipConduit conduit1 <* ZipConduit conduit2 + sink = CL.consume + res <- src $$ conduit =$ sink + res `shouldBe` [2, 1, 3, 2, 4, 3]
