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 2021-10-12 21:49:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-conduit (Old) and /work/SRC/openSUSE:Factory/.ghc-conduit.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-conduit" Tue Oct 12 21:49:06 2021 rev:32 rq:923797 version:1.3.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-conduit/ghc-conduit.changes 2021-03-10 08:58:05.694940981 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-conduit.new.2443/ghc-conduit.changes 2021-10-12 21:50:21.371957860 +0200 @@ -1,0 +2,8 @@ +Mon Sep 27 13:52:41 UTC 2021 - psim...@suse.com + +- Update conduit to version 1.3.4.2. + ## 1.3.4.2 + + * Fix GHC 9.2 build [#473](https://github.com/snoyberg/conduit/pull/473) + +------------------------------------------------------------------- Old: ---- conduit-1.3.4.1.tar.gz New: ---- conduit-1.3.4.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-conduit.spec ++++++ --- /var/tmp/diff_new_pack.fL7UVh/_old 2021-10-12 21:50:21.927958656 +0200 +++ /var/tmp/diff_new_pack.fL7UVh/_new 2021-10-12 21:50:21.927958656 +0200 @@ -19,7 +19,7 @@ %global pkg_name conduit %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.3.4.1 +Version: 1.3.4.2 Release: 0 Summary: Streaming data processing library License: MIT ++++++ conduit-1.3.4.1.tar.gz -> conduit-1.3.4.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conduit-1.3.4.1/ChangeLog.md new/conduit-1.3.4.2/ChangeLog.md --- old/conduit-1.3.4.1/ChangeLog.md 2021-03-02 08:18:44.000000000 +0100 +++ new/conduit-1.3.4.2/ChangeLog.md 2021-09-26 06:27:07.000000000 +0200 @@ -1,5 +1,9 @@ # ChangeLog for conduit +## 1.3.4.2 + +* Fix GHC 9.2 build [#473](https://github.com/snoyberg/conduit/pull/473) + ## 1.3.4.1 * Library and tests compile and run with GHC 9.0.1 [#455](https://github.com/snoyberg/conduit/pull/455) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conduit-1.3.4.1/conduit.cabal new/conduit-1.3.4.2/conduit.cabal --- old/conduit-1.3.4.1/conduit.cabal 2021-03-02 08:18:50.000000000 +0100 +++ new/conduit-1.3.4.2/conduit.cabal 2021-09-26 06:27:07.000000000 +0200 @@ -1,5 +1,5 @@ Name: conduit -Version: 1.3.4.1 +Version: 1.3.4.2 Synopsis: Streaming data processing library. description: `conduit` is a solution to the streaming data problem, allowing for production, @@ -43,7 +43,7 @@ Data.Conduit.Combinators.Unqualified Data.Streaming.FileRead Data.Streaming.Filesystem - Build-depends: base >= 4.9 && < 5 + Build-depends: base >= 4.12 && < 5 , resourcet >= 1.2 && < 1.3 , transformers >= 0.4 , mtl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conduit-1.3.4.1/src/Data/Conduit/Internal/Conduit.hs new/conduit-1.3.4.2/src/Data/Conduit/Internal/Conduit.hs --- old/conduit-1.3.4.1/src/Data/Conduit/Internal/Conduit.hs 2021-03-02 08:18:06.000000000 +0100 +++ new/conduit-1.3.4.2/src/Data/Conduit/Internal/Conduit.hs 2021-09-26 06:27:01.000000000 +0200 @@ -328,8 +328,8 @@ recurse = goLeft rp rc sourceToPipe :: Monad m => Source m o -> Pipe l i o u m () -sourceToPipe = - go . (`unConduitT` Done) +sourceToPipe (ConduitT k) = + go $ k Done where go (HaveOutput p o) = HaveOutput (go p) o go (NeedInput _ c) = go $ c () @@ -338,8 +338,8 @@ go (Leftover p ()) = go p sinkToPipe :: Monad m => Sink i m r -> Pipe l i o u m r -sinkToPipe = - go . injectLeftovers . (`unConduitT` Done) +sinkToPipe (ConduitT k) = + go $ injectLeftovers $ k Done where go (HaveOutput _ o) = absurd o go (NeedInput p c) = NeedInput (go . p) (const $ go $ c ()) @@ -348,8 +348,8 @@ go (Leftover _ l) = absurd l conduitToPipe :: Monad m => Conduit i m o -> Pipe l i o u m () -conduitToPipe = - go . injectLeftovers . (`unConduitT` Done) +conduitToPipe (ConduitT k) = + go $ injectLeftovers $ k Done where go (HaveOutput p o) = HaveOutput (go p) o go (NeedInput p c) = NeedInput (go . p) (const $ go $ c ()) @@ -401,8 +401,9 @@ -> ConduitT i o m r catchC (ConduitT p0) onErr = ConduitT $ \rest -> let go (Done r) = rest r - go (PipeM mp) = PipeM $ withRunInIO $ \run -> E.catch (run (liftM go mp)) - (return . (`unConduitT`rest) . onErr) + go (PipeM mp) = PipeM $ withRunInIO $ \ run -> + run (liftM go mp) `E.catch` \ e -> + return $ onErr e `unConduitT` rest go (Leftover p i) = Leftover (go p) i go (NeedInput x y) = NeedInput (go . x) (go . y) go (HaveOutput p o) = HaveOutput (go p) o @@ -693,8 +694,8 @@ -- -- Since 1.2.6 sourceToList :: Monad m => Source m a -> m [a] -sourceToList = - go . (`unConduitT` Done) +sourceToList (ConduitT k) = + go $ k Done where go (Done _) = return [] go (HaveOutput src x) = liftM (x:) (go src)
