Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-conduit for openSUSE:Factory checked in at 2024-09-03 13:38:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-conduit (Old) and /work/SRC/openSUSE:Factory/.ghc-conduit.new.2698 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-conduit" Tue Sep 3 13:38:36 2024 rev:37 rq:1198344 version:1.3.6 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-conduit/ghc-conduit.changes 2023-06-22 23:25:42.153731870 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-conduit.new.2698/ghc-conduit.changes 2024-09-03 13:39:03.362547542 +0200 @@ -1,0 +2,8 @@ +Mon Aug 26 14:58:19 UTC 2024 - Peter Simons <psim...@suse.com> + +- Update conduit to version 1.3.6. + ## 1.3.6 + + * Avoid dropping upstream items in `mergeSource` [#513](https://github.com/snoyberg/conduit/pull/513) + +------------------------------------------------------------------- Old: ---- conduit-1.3.5.tar.gz New: ---- conduit-1.3.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-conduit.spec ++++++ --- /var/tmp/diff_new_pack.um3Sdw/_old 2024-09-03 13:39:04.070577076 +0200 +++ /var/tmp/diff_new_pack.um3Sdw/_new 2024-09-03 13:39:04.070577076 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-conduit # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.3.5 +Version: 1.3.6 Release: 0 Summary: Streaming data processing library License: MIT ++++++ conduit-1.3.5.tar.gz -> conduit-1.3.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conduit-1.3.5/ChangeLog.md new/conduit-1.3.6/ChangeLog.md --- old/conduit-1.3.5/ChangeLog.md 2023-05-22 17:14:02.000000000 +0200 +++ new/conduit-1.3.6/ChangeLog.md 2024-08-26 16:54:26.000000000 +0200 @@ -1,5 +1,9 @@ # ChangeLog for conduit +## 1.3.6 + +* Avoid dropping upstream items in `mergeSource` [#513](https://github.com/snoyberg/conduit/pull/513) + ## 1.3.5 * Add `groupOn` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conduit-1.3.5/conduit.cabal new/conduit-1.3.6/conduit.cabal --- old/conduit-1.3.5/conduit.cabal 2023-05-22 17:13:51.000000000 +0200 +++ new/conduit-1.3.6/conduit.cabal 2024-08-26 16:58:09.000000000 +0200 @@ -1,5 +1,5 @@ Name: conduit -Version: 1.3.5 +Version: 1.3.6 Synopsis: Streaming data processing library. description: `conduit` is a solution to the streaming data problem, allowing for production, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conduit-1.3.5/src/Data/Conduit/Internal/Conduit.hs new/conduit-1.3.6/src/Data/Conduit/Internal/Conduit.hs --- old/conduit-1.3.5/src/Data/Conduit/Internal/Conduit.hs 2023-05-22 16:25:20.000000000 +0200 +++ new/conduit-1.3.6/src/Data/Conduit/Internal/Conduit.hs 2024-08-26 16:54:26.000000000 +0200 @@ -613,7 +613,7 @@ go a = do (src1, mi) <- lift $ src0 $$++ await case mi of - Nothing -> return () + Nothing -> leftover a Just i -> yield (i, a) >> loop src1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conduit-1.3.5/test/main.hs new/conduit-1.3.6/test/main.hs --- old/conduit-1.3.5/test/main.hs 2023-05-22 16:25:20.000000000 +0200 +++ new/conduit-1.3.6/test/main.hs 2024-08-26 16:54:26.000000000 +0200 @@ -32,7 +32,7 @@ import Control.Monad.Trans.Writer (execWriter, tell, runWriterT) import Control.Monad.Trans.State (evalStateT, get, put) import qualified Control.Monad.Writer as W -import Control.Applicative (pure, (<$>), (<*>)) +import Control.Applicative (pure, (<$>), (<*>), liftA2) import qualified Control.Monad.Catch as Catch import Data.Functor.Identity (Identity,runIdentity) import Control.Monad (forever, void) @@ -704,6 +704,12 @@ withShortAlphaIndex = CI.mergeSource (CL.sourceList ["A", "B", "C"]) output <- runConduit $ src .| withShortAlphaIndex .| CL.consume output `shouldBe` [("A", 1), ("B", 2), ("C", 3)] + it "does not drop upstream items" $ do + let num = CL.sourceList [1 .. 10 :: Int] + let chr = CL.sourceList ['a' .. 'c'] + (output, remainder) <- runConduit $ num .| liftA2 (,) (CI.mergeSource chr .| CL.consume) CL.consume + output `shouldBe` [('a', 1), ('b', 2), ('c', 3)] + remainder `shouldBe` [4 .. 10] describe "passthroughSink" $ do it "works" $ do
