Hello community, here is the log from the commit of package ghc-conduit-extra for openSUSE:Leap:15.2 checked in at 2020-02-19 18:38:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/ghc-conduit-extra (Old) and /work/SRC/openSUSE:Leap:15.2/.ghc-conduit-extra.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-conduit-extra" Wed Feb 19 18:38:20 2020 rev:12 rq:771263 version:1.3.4 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/ghc-conduit-extra/ghc-conduit-extra.changes 2020-01-15 15:01:56.021794719 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.ghc-conduit-extra.new.26092/ghc-conduit-extra.changes 2020-02-19 18:38:37.825970622 +0100 @@ -1,0 +2,39 @@ +Fri Nov 8 16:13:27 UTC 2019 - Peter Simons <[email protected]> + +- Drop obsolete group attributes. + +------------------------------------------------------------------- +Thu Jul 4 02:03:29 UTC 2019 - [email protected] + +- Update conduit-extra to version 1.3.4. + ## 1.3.4 + + * Use `MonadUnliftIO`-generalized versions of `withProcess`-style functions now provided by `typed-process` + +------------------------------------------------------------------- +Thu Jun 27 02:02:51 UTC 2019 - [email protected] + +- Update conduit-extra to version 1.3.3. + ## 1.3.3 + + * Disable buffering in process modules [#402](https://github.com/snoyberg/conduit/issues/402) + +------------------------------------------------------------------- +Fri Jun 14 02:03:31 UTC 2019 - [email protected] + +- Update conduit-extra to version 1.3.2. + ## 1.3.2 + + * Expose `BuilderInput` and `FlushInput`. + +------------------------------------------------------------------- +Wed Mar 13 11:03:21 UTC 2019 - [email protected] + +- Update conduit-extra to version 1.3.1.1. + # ChangeLog for conduit-extra + + ## 1.3.1.1 + + * Attempt to fix a test suite failure [#385](https://github.com/snoyberg/conduit/issues/385) + +------------------------------------------------------------------- Old: ---- conduit-extra-1.3.1.tar.gz New: ---- conduit-extra-1.3.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-conduit-extra.spec ++++++ --- /var/tmp/diff_new_pack.TM4TfI/_old 2020-02-19 18:38:38.085971166 +0100 +++ /var/tmp/diff_new_pack.TM4TfI/_new 2020-02-19 18:38:38.085971166 +0100 @@ -19,11 +19,10 @@ %global pkg_name conduit-extra %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.3.1 +Version: 1.3.4 Release: 0 Summary: Batteries included conduit: adapters for common libraries License: MIT -Group: Development/Libraries/Haskell URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel @@ -61,7 +60,6 @@ %package devel Summary: Haskell %{pkg_name} library development files -Group: Development/Libraries/Haskell Requires: %{name} = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} ++++++ conduit-extra-1.3.1.tar.gz -> conduit-extra-1.3.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conduit-extra-1.3.1/ChangeLog.md new/conduit-extra-1.3.4/ChangeLog.md --- old/conduit-extra-1.3.1/ChangeLog.md 2019-02-19 03:05:30.000000000 +0100 +++ new/conduit-extra-1.3.4/ChangeLog.md 2019-07-03 07:29:45.000000000 +0200 @@ -1,3 +1,21 @@ +# ChangeLog for conduit-extra + +## 1.3.4 + +* Use `MonadUnliftIO`-generalized versions of `withProcess`-style functions now provided by `typed-process` + +## 1.3.3 + +* Disable buffering in process modules [#402](https://github.com/snoyberg/conduit/issues/402) + +## 1.3.2 + +* Expose `BuilderInput` and `FlushInput`. + +## 1.3.1.1 + +* Attempt to fix a test suite failure [#385](https://github.com/snoyberg/conduit/issues/385) + ## 1.3.1 * Switched `gzip` to use zlib's default compression level. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conduit-extra-1.3.1/Data/Conduit/Process/Typed.hs new/conduit-extra-1.3.4/Data/Conduit/Process/Typed.hs --- old/conduit-extra-1.3.1/Data/Conduit/Process/Typed.hs 2018-03-14 07:08:08.000000000 +0100 +++ new/conduit-extra-1.3.4/Data/Conduit/Process/Typed.hs 2019-07-03 07:01:28.000000000 +0200 @@ -6,15 +6,13 @@ ( -- * Conduit specific stuff createSink , createSource - -- * Generalized functions - , withProcess -- FIXME import from rio instead - , withProcess_ + -- * Running a process with logging , withLoggedProcess_ -- * Reexports , module System.Process.Typed ) where -import System.Process.Typed hiding (withProcess, withProcess_) +import System.Process.Typed import qualified System.Process.Typed as P import Data.Conduit (ConduitM, (.|), runConduit) import qualified Data.Conduit.Binary as CB @@ -25,18 +23,23 @@ import Data.IORef (IORef, newIORef, readIORef, modifyIORef) import Control.Exception (throwIO, catch) import Control.Concurrent.Async (concurrently) +import System.IO (hSetBuffering, BufferMode (NoBuffering)) -- | Provide input to a process by writing to a conduit. -- -- @since 1.2.1 createSink :: MonadIO m => StreamSpec 'STInput (ConduitM S.ByteString o m ()) -createSink = CB.sinkHandle `fmap` createPipe +createSink = + (\h -> liftIO (hSetBuffering h NoBuffering) >> CB.sinkHandle h) + `fmap` createPipe -- | Read output from a process by read from a conduit. -- -- @since 1.2.1 createSource :: MonadIO m => StreamSpec 'STOutput (ConduitM i S.ByteString m ()) -createSource = CB.sourceHandle `fmap` createPipe +createSource = + (\h -> liftIO (hSetBuffering h NoBuffering) >> CB.sourceHandle h) + `fmap` createPipe -- | Internal function: like 'createSource', but stick all chunks into -- the 'IORef'. @@ -92,7 +95,10 @@ stderrBuffer <- newIORef id let pc' = setStdout (createSourceLogged stdoutBuffer) $ setStderr (createSourceLogged stderrBuffer) pc - P.withProcess pc' $ \p -> do + -- withProcessWait vs Term doesn't actually matter here, since we + -- call checkExitCode inside regardless. But still, Wait is the + -- safer function to use in general. + P.withProcessWait pc' $ \p -> do a <- unliftIO u $ inner p let drain src = unliftIO u (runConduit (src .| CL.sinkNull)) ((), ()) <- drain (getStdout p) `concurrently` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conduit-extra-1.3.1/Data/Conduit/Process.hs new/conduit-extra-1.3.4/Data/Conduit/Process.hs --- old/conduit-extra-1.3.1/Data/Conduit/Process.hs 2018-03-14 07:08:08.000000000 +0100 +++ new/conduit-extra-1.3.4/Data/Conduit/Process.hs 2019-06-19 07:57:42.000000000 +0200 @@ -18,6 +18,9 @@ , sourceCmdWithStreams , sourceProcessWithStreams , withCheckedProcessCleanup + -- * InputSource types + , FlushInput(..) + , BuilderInput(..) -- * Reexport , module Data.Streaming.Process ) where @@ -26,8 +29,9 @@ import Data.Streaming.Process.Internal import System.Exit (ExitCode (..)) import Control.Monad.IO.Unlift (MonadIO, liftIO, MonadUnliftIO, withRunInIO, withUnliftIO, unliftIO) -import System.IO (hClose) +import System.IO (hClose, BufferMode (NoBuffering), hSetBuffering) import Data.Conduit +import Data.Functor (($>)) import Data.Conduit.Binary (sourceHandle, sinkHandle, sinkHandleBuilder, sinkHandleFlush) import Data.ByteString (ByteString) import Data.ByteString.Builder (Builder) @@ -38,21 +42,21 @@ #endif instance (r ~ (), MonadIO m, i ~ ByteString) => InputSource (ConduitM i o m r) where - isStdStream = (\(Just h) -> return $ sinkHandle h, Just CreatePipe) + isStdStream = (\(Just h) -> hSetBuffering h NoBuffering $> sinkHandle h, Just CreatePipe) instance (r ~ (), r' ~ (), MonadIO m, MonadIO n, i ~ ByteString) => InputSource (ConduitM i o m r, n r') where - isStdStream = (\(Just h) -> return (sinkHandle h, liftIO $ hClose h), Just CreatePipe) + isStdStream = (\(Just h) -> hSetBuffering h NoBuffering $> (sinkHandle h, liftIO $ hClose h), Just CreatePipe) -- | Wrapper for input source which accepts 'Data.ByteString.Builder.Builder's. -- You can pass 'Data.ByteString.Builder.Extra.flush' to flush the input. Note -- that the pipe will /not/ automatically close when the processing completes. -- --- @since 1.2.2 +-- @since 1.3.2 newtype BuilderInput o m r = BuilderInput (ConduitM Builder o m r) -- | Wrapper for input source which accepts @Flush@es. Note that the pipe -- will /not/ automatically close then processing completes. -- --- @since 1.2.2 +-- @since 1.3.2 newtype FlushInput o m r = FlushInput (ConduitM (Flush ByteString) o m r) instance (MonadIO m, r ~ ()) => InputSource (BuilderInput o m r) where @@ -65,9 +69,9 @@ isStdStream = (\(Just h) -> return (FlushInput $ sinkHandleFlush h, liftIO $ hClose h), Just CreatePipe) instance (r ~ (), MonadIO m, o ~ ByteString) => OutputSink (ConduitM i o m r) where - osStdStream = (\(Just h) -> return $ sourceHandle h, Just CreatePipe) + osStdStream = (\(Just h) -> hSetBuffering h NoBuffering $> sourceHandle h, Just CreatePipe) instance (r ~ (), r' ~ (), MonadIO m, MonadIO n, o ~ ByteString) => OutputSink (ConduitM i o m r, n r') where - osStdStream = (\(Just h) -> return (sourceHandle h, liftIO $ hClose h), Just CreatePipe) + osStdStream = (\(Just h) -> hSetBuffering h NoBuffering $> (sourceHandle h, liftIO $ hClose h), Just CreatePipe) -- | Given a @CreateProcess@, run the process, with its output being used as a -- @Source@ to feed the provided @Consumer@. Once the process has completed, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conduit-extra-1.3.1/conduit-extra.cabal new/conduit-extra-1.3.4/conduit-extra.cabal --- old/conduit-extra-1.3.1/conduit-extra.cabal 2019-02-19 03:05:30.000000000 +0100 +++ new/conduit-extra-1.3.4/conduit-extra.cabal 2019-07-03 07:29:20.000000000 +0200 @@ -1,5 +1,5 @@ Name: conduit-extra -Version: 1.3.1 +Version: 1.3.4 Synopsis: Batteries included conduit: adapters for common libraries. Description: The conduit package itself maintains relative small dependencies. The purpose of this package is to collect commonly used utility functions wrapping other library dependencies, without depending on heavier-weight dependencies. The basic idea is that this package should only depend on haskell-platform packages and conduit. @@ -56,7 +56,7 @@ , stm , streaming-commons >= 0.1.16 , unliftio-core - , typed-process >= 0.2 + , typed-process >= 0.2.6 ghc-options: -Wall diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conduit-extra-1.3.1/test/Data/Conduit/Process/TypedSpec.hs new/conduit-extra-1.3.4/test/Data/Conduit/Process/TypedSpec.hs --- old/conduit-extra-1.3.1/test/Data/Conduit/Process/TypedSpec.hs 2018-02-25 16:29:16.000000000 +0100 +++ new/conduit-extra-1.3.4/test/Data/Conduit/Process/TypedSpec.hs 2019-03-12 08:57:49.000000000 +0100 @@ -12,13 +12,15 @@ let fp = "ChangeLog.md" pc = setStdout createSource $ proc "cat" [fp] bs <- B.readFile fp - bss <- withProcess_ pc $ \p -> runConduit $ getStdout p .| CL.consume + bss <- withProcess_ pc $ \p -> + runConduit (getStdout p .| CL.consume) <* waitExitCode p B.concat bss `shouldBe` bs it "cat works with withLoggedProcess_" $ do let fp = "ChangeLog.md" pc = proc "cat" [fp] bs <- B.readFile fp - bss <- withLoggedProcess_ pc $ \p -> runConduit $ getStdout p .| CL.consume + bss <- withLoggedProcess_ pc $ \p -> + runConduit (getStdout p .| CL.consume) <* waitExitCode p B.concat bss `shouldBe` bs it "failing process throws" $ do (withLoggedProcess_ (proc "cat" ["does not exist"]) $ \p -> do
