commit ghc-conduit-extra for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-conduit-extra for
openSUSE:Factory checked in at 2020-08-28 21:27:50
Comparing /work/SRC/openSUSE:Factory/ghc-conduit-extra (Old)
and /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new.3399 (New)
Package is "ghc-conduit-extra"
Fri Aug 28 21:27:50 2020 rev:26 rq:829224 version:1.3.5
Changes:
--- /work/SRC/openSUSE:Factory/ghc-conduit-extra/ghc-conduit-extra.changes
2020-06-19 17:10:05.429527868 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-conduit-extra.new.3399/ghc-conduit-extra.changes
2020-08-28 21:27:51.856510220 +0200
@@ -1,0 +2,5 @@
+Tue Aug 18 10:44:24 UTC 2020 - Peter Simons
+
+- Replace %setup -q with the more modern %autosetup macro.
+
+---
Other differences:
--
++ ghc-conduit-extra.spec ++
--- /var/tmp/diff_new_pack.3J6FKU/_old 2020-08-28 21:27:53.092510806 +0200
+++ /var/tmp/diff_new_pack.3J6FKU/_new 2020-08-28 21:27:53.096510807 +0200
@@ -69,7 +69,7 @@
This package provides the Haskell %{pkg_name} library development files.
%prep
-%setup -q -n %{pkg_name}-%{version}
+%autosetup -n %{pkg_name}-%{version}
%build
%ghc_lib_build
commit ghc-conduit-extra for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-conduit-extra for openSUSE:Factory checked in at 2020-06-19 17:10:02 Comparing /work/SRC/openSUSE:Factory/ghc-conduit-extra (Old) and /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new.3606 (New) Package is "ghc-conduit-extra" Fri Jun 19 17:10:02 2020 rev:25 rq:815060 version:1.3.5 Changes: --- /work/SRC/openSUSE:Factory/ghc-conduit-extra/ghc-conduit-extra.changes 2020-05-11 13:35:17.584355292 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new.3606/ghc-conduit-extra.changes 2020-06-19 17:10:05.429527868 +0200 @@ -1,0 +2,5 @@ +Tue Jun 16 11:13:55 UTC 2020 - Peter Simons + +- Re-generate file with latest version of spec-cleaner. + +--- Other differences: -- ++ ghc-conduit-extra.spec ++ --- /var/tmp/diff_new_pack.8dwx3r/_old 2020-06-19 17:10:06.437530998 +0200 +++ /var/tmp/diff_new_pack.8dwx3r/_new 2020-06-19 17:10:06.437530998 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-conduit-extra # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed
commit ghc-conduit-extra for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-conduit-extra for
openSUSE:Factory checked in at 2020-05-11 13:34:25
Comparing /work/SRC/openSUSE:Factory/ghc-conduit-extra (Old)
and /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new.2738 (New)
Package is "ghc-conduit-extra"
Mon May 11 13:34:25 2020 rev:24 rq:801007 version:1.3.5
Changes:
--- /work/SRC/openSUSE:Factory/ghc-conduit-extra/ghc-conduit-extra.changes
2019-12-27 13:52:27.808620099 +0100
+++
/work/SRC/openSUSE:Factory/.ghc-conduit-extra.new.2738/ghc-conduit-extra.changes
2020-05-11 13:35:17.584355292 +0200
@@ -1,0 +2,8 @@
+Wed May 6 06:54:14 UTC 2020 - psim...@suse.com
+
+- Update conduit-extra to version 1.3.5.
+ ## 1.3.5
+
+ * Add `createSinkClose`
+
+---
Old:
conduit-extra-1.3.4.tar.gz
New:
conduit-extra-1.3.5.tar.gz
Other differences:
--
++ ghc-conduit-extra.spec ++
--- /var/tmp/diff_new_pack.5r6wIo/_old 2020-05-11 13:35:18.252356693 +0200
+++ /var/tmp/diff_new_pack.5r6wIo/_new 2020-05-11 13:35:18.252356693 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-conduit-extra
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%global pkg_name conduit-extra
%bcond_with tests
Name: ghc-%{pkg_name}
-Version:1.3.4
+Version:1.3.5
Release:0
Summary:Batteries included conduit: adapters for common libraries
License:MIT
++ conduit-extra-1.3.4.tar.gz -> conduit-extra-1.3.5.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.3.4/ChangeLog.md
new/conduit-extra-1.3.5/ChangeLog.md
--- old/conduit-extra-1.3.4/ChangeLog.md2019-07-03 07:29:45.0
+0200
+++ new/conduit-extra-1.3.5/ChangeLog.md2020-03-18 09:08:22.0
+0100
@@ -1,5 +1,9 @@
# ChangeLog for conduit-extra
+## 1.3.5
+
+* Add `createSinkClose`
+
## 1.3.4
* Use `MonadUnliftIO`-generalized versions of `withProcess`-style functions
now provided by `typed-process`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.3.4/Data/Conduit/Process/Typed.hs
new/conduit-extra-1.3.5/Data/Conduit/Process/Typed.hs
--- old/conduit-extra-1.3.4/Data/Conduit/Process/Typed.hs 2019-07-03
07:01:28.0 +0200
+++ new/conduit-extra-1.3.5/Data/Conduit/Process/Typed.hs 2020-03-19
08:39:46.0 +0100
@@ -5,6 +5,7 @@
module Data.Conduit.Process.Typed
( -- * Conduit specific stuff
createSink
+ , createSinkClose
, createSource
-- * Running a process with logging
, withLoggedProcess_
@@ -23,9 +24,13 @@
import Data.IORef (IORef, newIORef, readIORef, modifyIORef)
import Control.Exception (throwIO, catch)
import Control.Concurrent.Async (concurrently)
-import System.IO (hSetBuffering, BufferMode (NoBuffering))
+import System.IO (hSetBuffering, BufferMode (NoBuffering), hClose)
--- | Provide input to a process by writing to a conduit.
+-- | Provide input to a process by writing to a conduit. The sink provided here
+-- will leave the pipe to the child open after the stream ends. This allows the
+-- sink to be used multiple times, but may result in surprising behavior. You
+-- may prefer 'createSinkClose', see
+-- .
--
-- @since 1.2.1
createSink :: MonadIO m => StreamSpec 'STInput (ConduitM S.ByteString o m ())
@@ -33,6 +38,15 @@
(\h -> liftIO (hSetBuffering h NoBuffering) >> CB.sinkHandle h)
`fmap` createPipe
+-- | Like 'createSink', but closes the pipe to the child process as soon as it
+-- runs out of data.
+--
+-- @since 1.3.5
+createSinkClose :: MonadIO m => StreamSpec 'STInput (ConduitM S.ByteString o m
())
+createSinkClose =
+ (\h -> liftIO (hSetBuffering h NoBuffering) >> CB.sinkHandle h >> liftIO
(hClose h))
+ `fmap` createPipe
+
-- | Read output from a process by read from a conduit.
--
-- @since 1.2.1
@@ -56,26 +70,6 @@
)
`fmap` createPipe
--- | Same as 'P.withProcess', but generalized to 'MonadUnliftIO'.
---
--- @since 1.2.1
-withProcess
- :: MonadUnliftIO m
- => ProcessConfig stdin stdout stderr
- -> (Process stdin stdout stderr -> m a)
- -> m a
-withProcess pc f = withRunInIO $ \run -> P.withProcess pc (run . f)
-
--- | Same as 'P.withProcess_', but generalized to 'MonadUnliftIO'.
---
--- @since 1.2.1
-withProcess_
- :: MonadUnliftIO m
- => ProcessConfig stdin
commit ghc-conduit-extra for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-conduit-extra for
openSUSE:Factory checked in at 2019-12-27 13:52:26
Comparing /work/SRC/openSUSE:Factory/ghc-conduit-extra (Old)
and /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new.6675 (New)
Package is "ghc-conduit-extra"
Fri Dec 27 13:52:26 2019 rev:23 rq:759366 version:1.3.4
Changes:
--- /work/SRC/openSUSE:Factory/ghc-conduit-extra/ghc-conduit-extra.changes
2019-07-29 17:26:06.894308351 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-conduit-extra.new.6675/ghc-conduit-extra.changes
2019-12-27 13:52:27.808620099 +0100
@@ -1,0 +2,5 @@
+Fri Nov 8 16:13:27 UTC 2019 - Peter Simons
+
+- Drop obsolete group attributes.
+
+---
Other differences:
--
++ ghc-conduit-extra.spec ++
--- /var/tmp/diff_new_pack.7vNAfq/_old 2019-12-27 13:52:28.300620449 +0100
+++ /var/tmp/diff_new_pack.7vNAfq/_new 2019-12-27 13:52:28.304620452 +0100
@@ -23,7 +23,6 @@
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}
commit ghc-conduit-extra for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-conduit-extra for
openSUSE:Factory checked in at 2019-07-29 17:26:04
Comparing /work/SRC/openSUSE:Factory/ghc-conduit-extra (Old)
and /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new.4126 (New)
Package is "ghc-conduit-extra"
Mon Jul 29 17:26:04 2019 rev:22 rq:715410 version:1.3.4
Changes:
--- /work/SRC/openSUSE:Factory/ghc-conduit-extra/ghc-conduit-extra.changes
2019-06-30 10:21:32.283623620 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-conduit-extra.new.4126/ghc-conduit-extra.changes
2019-07-29 17:26:06.894308351 +0200
@@ -1,0 +2,8 @@
+Thu Jul 4 02:03:29 UTC 2019 - psim...@suse.com
+
+- Update conduit-extra to version 1.3.4.
+ ## 1.3.4
+
+ * Use `MonadUnliftIO`-generalized versions of `withProcess`-style functions
now provided by `typed-process`
+
+---
Old:
conduit-extra-1.3.3.tar.gz
New:
conduit-extra-1.3.4.tar.gz
Other differences:
--
++ ghc-conduit-extra.spec ++
--- /var/tmp/diff_new_pack.MA5zEY/_old 2019-07-29 17:26:07.386308169 +0200
+++ /var/tmp/diff_new_pack.MA5zEY/_new 2019-07-29 17:26:07.390308168 +0200
@@ -19,7 +19,7 @@
%global pkg_name conduit-extra
%bcond_with tests
Name: ghc-%{pkg_name}
-Version:1.3.3
+Version:1.3.4
Release:0
Summary:Batteries included conduit: adapters for common libraries
License:MIT
++ conduit-extra-1.3.3.tar.gz -> conduit-extra-1.3.4.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.3.3/ChangeLog.md
new/conduit-extra-1.3.4/ChangeLog.md
--- old/conduit-extra-1.3.3/ChangeLog.md2019-06-19 07:58:06.0
+0200
+++ new/conduit-extra-1.3.4/ChangeLog.md2019-07-03 07:29:45.0
+0200
@@ -1,5 +1,9 @@
# 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)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.3.3/Data/Conduit/Process/Typed.hs
new/conduit-extra-1.3.4/Data/Conduit/Process/Typed.hs
--- old/conduit-extra-1.3.3/Data/Conduit/Process/Typed.hs 2019-06-19
07:57:42.0 +0200
+++ new/conduit-extra-1.3.4/Data/Conduit/Process/Typed.hs 2019-07-03
07:01:28.0 +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
@@ -97,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.3/conduit-extra.cabal
new/conduit-extra-1.3.4/conduit-extra.cabal
--- old/conduit-extra-1.3.3/conduit-extra.cabal 2019-06-19 07:58:11.0
+0200
+++ new/conduit-extra-1.3.4/conduit-extra.cabal 2019-07-03 07:29:20.0
+0200
@@ -1,5 +1,5 @@
Name:conduit-extra
-Version: 1.3.3
+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
+
commit ghc-conduit-extra for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-conduit-extra for
openSUSE:Factory checked in at 2019-06-30 10:21:32
Comparing /work/SRC/openSUSE:Factory/ghc-conduit-extra (Old)
and /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new.4615 (New)
Package is "ghc-conduit-extra"
Sun Jun 30 10:21:32 2019 rev:21 rq:712502 version:1.3.3
Changes:
--- /work/SRC/openSUSE:Factory/ghc-conduit-extra/ghc-conduit-extra.changes
2019-06-19 21:11:58.822718021 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-conduit-extra.new.4615/ghc-conduit-extra.changes
2019-06-30 10:21:32.283623620 +0200
@@ -1,0 +2,8 @@
+Thu Jun 27 02:02:51 UTC 2019 - psim...@suse.com
+
+- Update conduit-extra to version 1.3.3.
+ ## 1.3.3
+
+ * Disable buffering in process modules
[#402](https://github.com/snoyberg/conduit/issues/402)
+
+---
Old:
conduit-extra-1.3.2.tar.gz
New:
conduit-extra-1.3.3.tar.gz
Other differences:
--
++ ghc-conduit-extra.spec ++
--- /var/tmp/diff_new_pack.0hPyrN/_old 2019-06-30 10:21:32.759624359 +0200
+++ /var/tmp/diff_new_pack.0hPyrN/_new 2019-06-30 10:21:32.763624365 +0200
@@ -19,7 +19,7 @@
%global pkg_name conduit-extra
%bcond_with tests
Name: ghc-%{pkg_name}
-Version:1.3.2
+Version:1.3.3
Release:0
Summary:Batteries included conduit: adapters for common libraries
License:MIT
++ conduit-extra-1.3.2.tar.gz -> conduit-extra-1.3.3.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.3.2/ChangeLog.md
new/conduit-extra-1.3.3/ChangeLog.md
--- old/conduit-extra-1.3.2/ChangeLog.md2019-06-12 15:52:18.0
+0200
+++ new/conduit-extra-1.3.3/ChangeLog.md2019-06-19 07:58:06.0
+0200
@@ -1,5 +1,9 @@
# ChangeLog for conduit-extra
+## 1.3.3
+
+* Disable buffering in process modules
[#402](https://github.com/snoyberg/conduit/issues/402)
+
## 1.3.2
* Expose `BuilderInput` and `FlushInput`.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.3.2/Data/Conduit/Process/Typed.hs
new/conduit-extra-1.3.3/Data/Conduit/Process/Typed.hs
--- old/conduit-extra-1.3.2/Data/Conduit/Process/Typed.hs 2019-05-13
15:53:27.0 +0200
+++ new/conduit-extra-1.3.3/Data/Conduit/Process/Typed.hs 2019-06-19
07:57:42.0 +0200
@@ -25,18 +25,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'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.3.2/Data/Conduit/Process.hs
new/conduit-extra-1.3.3/Data/Conduit/Process.hs
--- old/conduit-extra-1.3.2/Data/Conduit/Process.hs 2019-06-12
15:52:18.0 +0200
+++ new/conduit-extra-1.3.3/Data/Conduit/Process.hs 2019-06-19
07:57:42.0 +0200
@@ -29,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)
@@ -41,9 +42,9 @@
#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
commit ghc-conduit-extra for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-conduit-extra for
openSUSE:Factory checked in at 2019-06-19 21:10:25
Comparing /work/SRC/openSUSE:Factory/ghc-conduit-extra (Old)
and /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new.4811 (New)
Package is "ghc-conduit-extra"
Wed Jun 19 21:10:25 2019 rev:20 rq:710622 version:1.3.2
Changes:
--- /work/SRC/openSUSE:Factory/ghc-conduit-extra/ghc-conduit-extra.changes
2019-03-19 09:59:38.592054103 +0100
+++
/work/SRC/openSUSE:Factory/.ghc-conduit-extra.new.4811/ghc-conduit-extra.changes
2019-06-19 21:11:58.822718021 +0200
@@ -1,0 +2,8 @@
+Fri Jun 14 02:03:31 UTC 2019 - psim...@suse.com
+
+- Update conduit-extra to version 1.3.2.
+ ## 1.3.2
+
+ * Expose `BuilderInput` and `FlushInput`.
+
+---
Old:
conduit-extra-1.3.1.1.tar.gz
New:
conduit-extra-1.3.2.tar.gz
Other differences:
--
++ ghc-conduit-extra.spec ++
--- /var/tmp/diff_new_pack.0extn2/_old 2019-06-19 21:11:59.702718876 +0200
+++ /var/tmp/diff_new_pack.0extn2/_new 2019-06-19 21:11:59.702718876 +0200
@@ -19,7 +19,7 @@
%global pkg_name conduit-extra
%bcond_with tests
Name: ghc-%{pkg_name}
-Version:1.3.1.1
+Version:1.3.2
Release:0
Summary:Batteries included conduit: adapters for common libraries
License:MIT
++ conduit-extra-1.3.1.1.tar.gz -> conduit-extra-1.3.2.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.3.1.1/ChangeLog.md
new/conduit-extra-1.3.2/ChangeLog.md
--- old/conduit-extra-1.3.1.1/ChangeLog.md 2019-03-12 08:55:48.0
+0100
+++ new/conduit-extra-1.3.2/ChangeLog.md2019-06-12 15:52:18.0
+0200
@@ -1,5 +1,9 @@
# ChangeLog for conduit-extra
+## 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)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.3.1.1/Data/Conduit/Process.hs
new/conduit-extra-1.3.2/Data/Conduit/Process.hs
--- old/conduit-extra-1.3.1.1/Data/Conduit/Process.hs 2018-03-14
07:08:08.0 +0100
+++ new/conduit-extra-1.3.2/Data/Conduit/Process.hs 2019-06-12
15:52:18.0 +0200
@@ -18,6 +18,9 @@
, sourceCmdWithStreams
, sourceProcessWithStreams
, withCheckedProcessCleanup
+ -- * InputSource types
+, FlushInput(..)
+, BuilderInput(..)
-- * Reexport
, module Data.Streaming.Process
) where
@@ -46,13 +49,13 @@
-- 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.3.1.1/conduit-extra.cabal
new/conduit-extra-1.3.2/conduit-extra.cabal
--- old/conduit-extra-1.3.1.1/conduit-extra.cabal 2019-03-12
08:55:27.0 +0100
+++ new/conduit-extra-1.3.2/conduit-extra.cabal 2019-06-12 15:52:18.0
+0200
@@ -1,5 +1,5 @@
Name:conduit-extra
-Version: 1.3.1.1
+Version: 1.3.2
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.
commit ghc-conduit-extra for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-conduit-extra for
openSUSE:Factory checked in at 2019-03-19 09:59:37
Comparing /work/SRC/openSUSE:Factory/ghc-conduit-extra (Old)
and /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new.28833 (New)
Package is "ghc-conduit-extra"
Tue Mar 19 09:59:37 2019 rev:19 rq:686007 version:1.3.1.1
Changes:
--- /work/SRC/openSUSE:Factory/ghc-conduit-extra/ghc-conduit-extra.changes
2019-02-24 17:18:35.360416469 +0100
+++
/work/SRC/openSUSE:Factory/.ghc-conduit-extra.new.28833/ghc-conduit-extra.changes
2019-03-19 09:59:38.592054103 +0100
@@ -1,0 +2,10 @@
+Wed Mar 13 11:03:21 UTC 2019 - psim...@suse.com
+
+- 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.1.1.tar.gz
Other differences:
--
++ ghc-conduit-extra.spec ++
--- /var/tmp/diff_new_pack.ejolQb/_old 2019-03-19 09:59:39.040052009 +0100
+++ /var/tmp/diff_new_pack.ejolQb/_new 2019-03-19 09:59:39.044051990 +0100
@@ -19,7 +19,7 @@
%global pkg_name conduit-extra
%bcond_with tests
Name: ghc-%{pkg_name}
-Version:1.3.1
+Version:1.3.1.1
Release:0
Summary:Batteries included conduit: adapters for common libraries
License:MIT
++ conduit-extra-1.3.1.tar.gz -> conduit-extra-1.3.1.1.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.1.1/ChangeLog.md
--- old/conduit-extra-1.3.1/ChangeLog.md2019-02-19 03:05:30.0
+0100
+++ new/conduit-extra-1.3.1.1/ChangeLog.md 2019-03-12 08:55:48.0
+0100
@@ -1,3 +1,9 @@
+# ChangeLog for conduit-extra
+
+## 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/conduit-extra.cabal
new/conduit-extra-1.3.1.1/conduit-extra.cabal
--- old/conduit-extra-1.3.1/conduit-extra.cabal 2019-02-19 03:05:30.0
+0100
+++ new/conduit-extra-1.3.1.1/conduit-extra.cabal 2019-03-12
08:55:27.0 +0100
@@ -1,5 +1,5 @@
Name:conduit-extra
-Version: 1.3.1
+Version: 1.3.1.1
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.
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.1.1/test/Data/Conduit/Process/TypedSpec.hs
--- old/conduit-extra-1.3.1/test/Data/Conduit/Process/TypedSpec.hs
2018-02-25 16:29:16.0 +0100
+++ new/conduit-extra-1.3.1.1/test/Data/Conduit/Process/TypedSpec.hs
2019-03-12 08:52:49.0 +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
commit ghc-conduit-extra for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-conduit-extra for
openSUSE:Factory checked in at 2019-02-24 17:18:34
Comparing /work/SRC/openSUSE:Factory/ghc-conduit-extra (Old)
and /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new.28833 (New)
Package is "ghc-conduit-extra"
Sun Feb 24 17:18:34 2019 rev:18 rq:678026 version:1.3.1
Changes:
--- /work/SRC/openSUSE:Factory/ghc-conduit-extra/ghc-conduit-extra.changes
2018-10-25 08:23:37.943876448 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-conduit-extra.new.28833/ghc-conduit-extra.changes
2019-02-24 17:18:35.360416469 +0100
@@ -1,0 +2,8 @@
+Tue Feb 19 10:28:17 UTC 2019 - psim...@suse.com
+
+- Update conduit-extra to version 1.3.1.
+ ## 1.3.1
+
+ * Switched `gzip` to use zlib's default compression level.
+
+---
Old:
conduit-extra-1.3.0.tar.gz
New:
conduit-extra-1.3.1.tar.gz
Other differences:
--
++ ghc-conduit-extra.spec ++
--- /var/tmp/diff_new_pack.SGOf6C/_old 2019-02-24 17:18:36.340416294 +0100
+++ /var/tmp/diff_new_pack.SGOf6C/_new 2019-02-24 17:18:36.344416294 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ghc-conduit-extra
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%global pkg_name conduit-extra
%bcond_with tests
Name: ghc-%{pkg_name}
-Version:1.3.0
+Version:1.3.1
Release:0
Summary:Batteries included conduit: adapters for common libraries
License:MIT
++ conduit-extra-1.3.0.tar.gz -> conduit-extra-1.3.1.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.3.0/ChangeLog.md
new/conduit-extra-1.3.1/ChangeLog.md
--- old/conduit-extra-1.3.0/ChangeLog.md2018-01-18 08:27:41.0
+0100
+++ new/conduit-extra-1.3.1/ChangeLog.md2019-02-19 03:05:30.0
+0100
@@ -1,3 +1,7 @@
+## 1.3.1
+
+* Switched `gzip` to use zlib's default compression level.
+
## 1.3.0
* Switch over to unliftio
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.3.0/Data/Conduit/Zlib.hs
new/conduit-extra-1.3.1/Data/Conduit/Zlib.hs
--- old/conduit-extra-1.3.0/Data/Conduit/Zlib.hs2018-01-18
08:27:41.0 +0100
+++ new/conduit-extra-1.3.1/Data/Conduit/Zlib.hs2019-02-19
03:05:30.0 +0100
@@ -26,7 +26,7 @@
-- | Gzip compression with default parameters.
gzip :: (MonadThrow m, PrimMonad m) => ConduitT ByteString ByteString m ()
-gzip = compress 1 (WindowBits 31)
+gzip = compress (-1) (WindowBits 31)
-- | Gzip decompression with default parameters.
ungzip :: (PrimMonad m, MonadThrow m) => ConduitT ByteString ByteString m ()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.3.0/conduit-extra.cabal
new/conduit-extra-1.3.1/conduit-extra.cabal
--- old/conduit-extra-1.3.0/conduit-extra.cabal 2018-01-18 08:27:41.0
+0100
+++ new/conduit-extra-1.3.1/conduit-extra.cabal 2019-02-19 03:05:30.0
+0100
@@ -1,5 +1,5 @@
Name:conduit-extra
-Version: 1.3.0
+Version: 1.3.1
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.
@@ -85,6 +85,7 @@
, transformers
, transformers-base
, directory
+ , filepath
ghc-options: -Wall
if os(windows)
cpp-options: -DWINDOWS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/conduit-extra-1.3.0/test/Data/Conduit/FilesystemSpec.hs
new/conduit-extra-1.3.1/test/Data/Conduit/FilesystemSpec.hs
--- old/conduit-extra-1.3.0/test/Data/Conduit/FilesystemSpec.hs 2018-01-18
08:27:41.0 +0100
+++ new/conduit-extra-1.3.1/test/Data/Conduit/FilesystemSpec.hs 2018-05-15
10:09:32.0 +0200
@@ -5,33 +5,34 @@
import qualified Data.Conduit.List as CL
import Data.Conduit.Filesystem
import Data.List (sort, isSuffixOf)
+import System.FilePath (())
spec :: Spec
spec = describe
commit ghc-conduit-extra for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-conduit-extra for openSUSE:Factory checked in at 2018-10-25 08:23:35 Comparing /work/SRC/openSUSE:Factory/ghc-conduit-extra (Old) and /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new (New) Package is "ghc-conduit-extra" Thu Oct 25 08:23:35 2018 rev:17 rq:643369 version:1.3.0 Changes: --- /work/SRC/openSUSE:Factory/ghc-conduit-extra/ghc-conduit-extra.changes 2018-07-24 17:16:16.790829010 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new/ghc-conduit-extra.changes 2018-10-25 08:23:37.943876448 +0200 @@ -1,0 +2,5 @@ +Sat Oct 20 11:31:19 UTC 2018 - Peter Simons + +- Use https URL to refer to bugs.opensuse.org. + +--- Other differences: -- ++ ghc-conduit-extra.spec ++ --- /var/tmp/diff_new_pack.oDkMxR/_old 2018-10-25 08:23:41.507874831 +0200 +++ /var/tmp/diff_new_pack.oDkMxR/_new 2018-10-25 08:23:41.515874827 +0200 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ #
commit ghc-conduit-extra for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-conduit-extra for openSUSE:Factory checked in at 2018-07-24 17:16:16 Comparing /work/SRC/openSUSE:Factory/ghc-conduit-extra (Old) and /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new (New) Package is "ghc-conduit-extra" Tue Jul 24 17:16:16 2018 rev:16 rq:623745 version:1.3.0 Changes: --- /work/SRC/openSUSE:Factory/ghc-conduit-extra/ghc-conduit-extra.changes 2018-05-30 12:25:14.166465505 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new/ghc-conduit-extra.changes 2018-07-24 17:16:16.790829010 +0200 @@ -1,0 +2,6 @@ +Wed Jul 18 14:26:18 UTC 2018 - psim...@suse.com + +- Cosmetic: replace tabs with blanks, strip trailing white space, + and update copyright headers with spec-cleaner. + +--- @@ -115 +120,0 @@ - Other differences: --
commit ghc-conduit-extra for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-conduit-extra for
openSUSE:Factory checked in at 2018-05-30 12:05:14
Comparing /work/SRC/openSUSE:Factory/ghc-conduit-extra (Old)
and /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new (New)
Package is "ghc-conduit-extra"
Wed May 30 12:05:14 2018 rev:15 rq:607771 version:1.3.0
Changes:
--- /work/SRC/openSUSE:Factory/ghc-conduit-extra/ghc-conduit-extra.changes
2017-09-15 21:28:09.621329944 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new/ghc-conduit-extra.changes
2018-05-30 12:25:14.166465505 +0200
@@ -1,0 +2,21 @@
+Mon May 14 17:02:11 UTC 2018 - psim...@suse.com
+
+- Update conduit-extra to version 1.3.0.
+ * Switch over to unliftio
+ * Upgrade to conduit 1.3.0
+ * Fix withSinkFileBuilder
[#344](https://github.com/snoyberg/conduit/pull/344)
+ * Fix typo in implementation of `withProcess_`
+ * Added `withLoggedProcess_`
+ * Add missing `hClose` to `withSinkFileCautious`
+ * `sinkHandleBuilder`, `sinkHandleFlush`, `BuilderInput`, and `FlushInput`
+[#336](https://github.com/snoyberg/conduit/pull/336)
+ * `withSinkFileCautious`
+ * `Data.Conduit.Process.Typed`
+ * `withSourceFile`, `withSinkFile`, and `withSinkFileBuilder`
+ * Added the `posOffset` field to the
+`Data.Conduit.Attoparsec.Position` data type
+[#331](https://github.com/snoyberg/conduit/issues/331).
+ * Speed up `sinkHandle` by not flushing after every output operation.
+[#322](https://github.com/snoyberg/conduit/issues/322)
+
+---
Old:
conduit-extra-1.1.16.tar.gz
New:
conduit-extra-1.3.0.tar.gz
Other differences:
--
++ ghc-conduit-extra.spec ++
--- /var/tmp/diff_new_pack.778phC/_old 2018-05-30 12:25:14.754446314 +0200
+++ /var/tmp/diff_new_pack.778phC/_new 2018-05-30 12:25:14.758446185 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-conduit-extra
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%global pkg_name conduit-extra
%bcond_with tests
Name: ghc-%{pkg_name}
-Version:1.1.16
+Version:1.3.0
Release:0
Summary:Batteries included conduit: adapters for common libraries
License:MIT
@@ -29,13 +29,10 @@
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-async-devel
BuildRequires: ghc-attoparsec-devel
-BuildRequires: ghc-blaze-builder-devel
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-conduit-devel
BuildRequires: ghc-directory-devel
-BuildRequires: ghc-exceptions-devel
BuildRequires: ghc-filepath-devel
-BuildRequires: ghc-monad-control-devel
BuildRequires: ghc-network-devel
BuildRequires: ghc-primitive-devel
BuildRequires: ghc-process-devel
@@ -44,12 +41,15 @@
BuildRequires: ghc-stm-devel
BuildRequires: ghc-streaming-commons-devel
BuildRequires: ghc-text-devel
-BuildRequires: ghc-transformers-base-devel
BuildRequires: ghc-transformers-devel
+BuildRequires: ghc-typed-process-devel
+BuildRequires: ghc-unliftio-core-devel
%if %{with tests}
BuildRequires: ghc-QuickCheck-devel
BuildRequires: ghc-bytestring-builder-devel
+BuildRequires: ghc-exceptions-devel
BuildRequires: ghc-hspec-devel
+BuildRequires: ghc-transformers-base-devel
%endif
%description
@@ -89,7 +89,7 @@
%ghc_pkg_recache
%files -f %{name}.files
-%doc LICENSE
+%license LICENSE
%files devel -f %{name}-devel.files
%doc ChangeLog.md README.md
++ conduit-extra-1.1.16.tar.gz -> conduit-extra-1.3.0.tar.gz ++
3335 lines of diff (skipped)
commit ghc-conduit-extra for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-conduit-extra for
openSUSE:Factory checked in at 2017-09-15 21:28:07
Comparing /work/SRC/openSUSE:Factory/ghc-conduit-extra (Old)
and /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new (New)
Package is "ghc-conduit-extra"
Fri Sep 15 21:28:07 2017 rev:14 rq:524320 version:1.1.16
Changes:
--- /work/SRC/openSUSE:Factory/ghc-conduit-extra/ghc-conduit-extra.changes
2017-06-04 01:57:06.151311630 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new/ghc-conduit-extra.changes
2017-09-15 21:28:09.621329944 +0200
@@ -1,0 +2,5 @@
+Thu Aug 3 15:38:38 UTC 2017 - psim...@suse.com
+
+- Updated with latest spec-cleaner version 0.9.8-8-geadfbbf.
+
+---
Other differences:
--
++ ghc-conduit-extra.spec ++
--- /var/tmp/diff_new_pack.qOkhow/_old 2017-09-15 21:28:10.537200864 +0200
+++ /var/tmp/diff_new_pack.qOkhow/_new 2017-09-15 21:28:10.541200301 +0200
@@ -23,8 +23,8 @@
Release:0
Summary:Batteries included conduit: adapters for common libraries
License:MIT
-Group: Development/Languages/Other
-Url:https://hackage.haskell.org/package/%{pkg_name}
+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
BuildRequires: ghc-async-devel
@@ -46,7 +46,6 @@
BuildRequires: ghc-text-devel
BuildRequires: ghc-transformers-base-devel
BuildRequires: ghc-transformers-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{with tests}
BuildRequires: ghc-QuickCheck-devel
BuildRequires: ghc-bytestring-builder-devel
@@ -62,7 +61,7 @@
%package devel
Summary:Haskell %{pkg_name} library development files
-Group: Development/Libraries/Other
+Group: Development/Libraries/Haskell
Requires: %{name} = %{version}-%{release}
Requires: ghc-compiler = %{ghc_version}
Requires(post): ghc-compiler = %{ghc_version}
@@ -90,11 +89,9 @@
%ghc_pkg_recache
%files -f %{name}.files
-%defattr(-,root,root,-)
%doc LICENSE
%files devel -f %{name}-devel.files
-%defattr(-,root,root,-)
%doc ChangeLog.md README.md
%changelog
commit ghc-conduit-extra for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-conduit-extra for
openSUSE:Factory checked in at 2017-06-04 01:57:04
Comparing /work/SRC/openSUSE:Factory/ghc-conduit-extra (Old)
and /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new (New)
Package is "ghc-conduit-extra"
Sun Jun 4 01:57:04 2017 rev:13 rq:499690 version:1.1.16
Changes:
--- /work/SRC/openSUSE:Factory/ghc-conduit-extra/ghc-conduit-extra.changes
2017-04-11 09:42:31.895385885 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new/ghc-conduit-extra.changes
2017-06-04 01:57:06.151311630 +0200
@@ -1,0 +2,5 @@
+Mon May 22 08:08:55 UTC 2017 - psim...@suse.com
+
+- Update to version 1.1.16 with cabal2obs.
+
+---
Old:
conduit-extra-1.1.15.tar.gz
conduit-extra.cabal
New:
conduit-extra-1.1.16.tar.gz
Other differences:
--
++ ghc-conduit-extra.spec ++
--- /var/tmp/diff_new_pack.xh5eoq/_old 2017-06-04 01:57:06.719231396 +0200
+++ /var/tmp/diff_new_pack.xh5eoq/_new 2017-06-04 01:57:06.719231396 +0200
@@ -19,14 +19,13 @@
%global pkg_name conduit-extra
%bcond_with tests
Name: ghc-%{pkg_name}
-Version:1.1.15
+Version:1.1.16
Release:0
Summary:Batteries included conduit: adapters for common libraries
License:MIT
Group: Development/Languages/Other
Url:https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
-Source1:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-async-devel
BuildRequires: ghc-attoparsec-devel
@@ -74,7 +73,6 @@
%prep
%setup -q -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
%build
%ghc_lib_build
++ conduit-extra-1.1.15.tar.gz -> conduit-extra-1.1.16.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.1.15/ChangeLog.md
new/conduit-extra-1.1.16/ChangeLog.md
--- old/conduit-extra-1.1.15/ChangeLog.md 2016-11-13 10:17:57.0
+0100
+++ new/conduit-extra-1.1.16/ChangeLog.md 2017-05-19 18:38:18.0
+0200
@@ -1,3 +1,8 @@
+## 1.1.16
+
+* Add `Data.Conduit.Foldl` adapter module for the `foldl`
+ package. [#312](https://github.com/snoyberg/conduit/pull/312)
+
## 1.1.15
* `sinkTempFile` and `sinkSystemTempFile`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.1.15/Data/Conduit/Foldl.hs
new/conduit-extra-1.1.16/Data/Conduit/Foldl.hs
--- old/conduit-extra-1.1.15/Data/Conduit/Foldl.hs 1970-01-01
01:00:00.0 +0100
+++ new/conduit-extra-1.1.16/Data/Conduit/Foldl.hs 2017-05-19
18:38:18.0 +0200
@@ -0,0 +1,26 @@
+{-# LANGUAGE RankNTypes #-}
+-- | Adapter module to work with the
package.
+--
+-- @since 1.1.16
+module Data.Conduit.Foldl where
+
+import Data.Conduit
+import Control.Monad.Trans.Class (lift)
+import qualified Data.Conduit.List as CL
+
+-- | Convert a left fold into a 'Consumer'. This function is intended
+-- to be used with @purely@ from the
+-- package.
+--
+-- @since 1.1.16
+sinkFold :: Monad m => (x -> a -> x) -> x -> (x -> b) -> Consumer a m b
+sinkFold combine seed extract = fmap extract (CL.fold combine seed)
+
+-- | Convert a monadic left fold into a 'Consumer'. This function is
+-- intended to be used with @impurely@ from the
+-- package.
+--
+-- @since 1.1.16
+sinkFoldM :: Monad m => (x -> a -> m x) -> m x -> (x -> m b) -> Consumer a m b
+sinkFoldM combine seed extract =
+ lift . extract =<< CL.foldM combine =<< lift seed
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.1.15/conduit-extra.cabal
new/conduit-extra-1.1.16/conduit-extra.cabal
--- old/conduit-extra-1.1.15/conduit-extra.cabal2016-11-13
10:17:57.0 +0100
+++ new/conduit-extra-1.1.16/conduit-extra.cabal2017-05-19
18:38:18.0 +0200
@@ -1,5 +1,5 @@
Name:conduit-extra
-Version: 1.1.15
+Version: 1.1.16
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
commit ghc-conduit-extra for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-conduit-extra for
openSUSE:Factory checked in at 2017-04-11 09:42:28
Comparing /work/SRC/openSUSE:Factory/ghc-conduit-extra (Old)
and /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new (New)
Package is "ghc-conduit-extra"
Tue Apr 11 09:42:28 2017 rev:12 rq:485114 version:1.1.15
Changes:
--- /work/SRC/openSUSE:Factory/ghc-conduit-extra/ghc-conduit-extra.changes
2016-12-09 09:36:56.315413621 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new/ghc-conduit-extra.changes
2017-04-11 09:42:31.895385885 +0200
@@ -1,0 +2,5 @@
+Mon Mar 27 12:41:01 UTC 2017 - psim...@suse.com
+
+- Update to version 1.1.15 revision 1 with cabal2obs.
+
+---
New:
conduit-extra.cabal
Other differences:
--
++ ghc-conduit-extra.spec ++
--- /var/tmp/diff_new_pack.CeJrVs/_old 2017-04-11 09:42:32.447307918 +0200
+++ /var/tmp/diff_new_pack.CeJrVs/_new 2017-04-11 09:42:32.447307918 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-conduit-extra
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,6 +26,7 @@
Group: Development/Languages/Other
Url:https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
+Source1:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-async-devel
BuildRequires: ghc-attoparsec-devel
@@ -73,6 +74,7 @@
%prep
%setup -q -n %{pkg_name}-%{version}
+cp -p %{SOURCE1} %{pkg_name}.cabal
%build
%ghc_lib_build
++ conduit-extra.cabal ++
Name:conduit-extra
Version: 1.1.15
x-revision: 1
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.
License: MIT
License-file:LICENSE
Author: Michael Snoyman
Maintainer: mich...@snoyman.com
Category:Data, Conduit
Build-type: Simple
Cabal-version: >=1.8
Homepage:http://github.com/snoyberg/conduit
extra-source-files:
test/random
test/filesystem/*.txt
test/filesystem/bin/*.txt
ChangeLog.md
README.md
Library
Exposed-modules: Data.Conduit.Attoparsec
Data.Conduit.Binary
Data.Conduit.Blaze
Data.Conduit.ByteString.Builder
Data.Conduit.Filesystem
Data.Conduit.Lazy
Data.Conduit.Network
Data.Conduit.Network.UDP
Data.Conduit.Process
Data.Conduit.Text
Data.Conduit.Zlib
if !os(windows)
Exposed-modules: Data.Conduit.Network.Unix
if arch(x86_64) || arch(i386)
-- These architectures are able to perform unaligned memory accesses
cpp-options: -DALLOW_UNALIGNED_ACCESS
Build-depends: base >= 4.5 && < 5
, conduit >= 1.1 && < 1.3
-- No version bounds necessary, since they're inherited
-- from conduit.
, bytestring
, exceptions >= 0.6 && < 0.9
, monad-control
, text
, transformers
, transformers-base
, async
, attoparsec >= 0.10
, blaze-builder>= 0.3
, directory
, filepath
, network >= 2.3
, primitive>= 0.5
, process
, resourcet>= 1.1
, stm
, streaming-commons>= 0.1.16
ghc-options: -Wall
test-suite test
hs-source-dirs: test
main-is: Spec.hs
type: exitcode-stdio-1.0
ghc-options:
commit ghc-conduit-extra for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-conduit-extra for
openSUSE:Factory checked in at 2016-11-03 11:13:49
Comparing /work/SRC/openSUSE:Factory/ghc-conduit-extra (Old)
and /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new (New)
Package is "ghc-conduit-extra"
Changes:
--- /work/SRC/openSUSE:Factory/ghc-conduit-extra/ghc-conduit-extra.changes
2016-07-21 08:06:43.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new/ghc-conduit-extra.changes
2016-11-03 11:13:50.0 +0100
@@ -1,0 +2,5 @@
+Mon Sep 26 06:52:26 UTC 2016 - psim...@suse.com
+
+- Update to version 1.1.13.3 with cabal2obs.
+
+---
Old:
conduit-extra-1.1.13.2.tar.gz
New:
conduit-extra-1.1.13.3.tar.gz
Other differences:
--
++ ghc-conduit-extra.spec ++
--- /var/tmp/diff_new_pack.4H8B6n/_old 2016-11-03 11:13:52.0 +0100
+++ /var/tmp/diff_new_pack.4H8B6n/_new 2016-11-03 11:13:52.0 +0100
@@ -19,15 +19,14 @@
%global pkg_name conduit-extra
%bcond_with tests
Name: ghc-%{pkg_name}
-Version:1.1.13.2
+Version:1.1.13.3
Release:0
Summary:Batteries included conduit: adapters for common libraries
License:MIT
-Group: System/Libraries
+Group: Development/Languages/Other
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
-# Begin cabal-rpm deps:
BuildRequires: ghc-async-devel
BuildRequires: ghc-attoparsec-devel
BuildRequires: ghc-blaze-builder-devel
@@ -53,7 +52,6 @@
BuildRequires: ghc-bytestring-builder-devel
BuildRequires: ghc-hspec-devel
%endif
-# End cabal-rpm deps
%description
The conduit package itself maintains relative small dependencies. The purpose
@@ -76,20 +74,14 @@
%prep
%setup -q -n %{pkg_name}-%{version}
-
%build
%ghc_lib_build
-
%install
%ghc_lib_install
-
%check
-%if %{with tests}
-%{cabal} test
-%endif
-
+%cabal_test
%post devel
%ghc_pkg_recache
++ conduit-extra-1.1.13.2.tar.gz -> conduit-extra-1.1.13.3.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.1.13.2/ChangeLog.md
new/conduit-extra-1.1.13.3/ChangeLog.md
--- old/conduit-extra-1.1.13.2/ChangeLog.md 2016-07-04 08:32:33.0
+0200
+++ new/conduit-extra-1.1.13.3/ChangeLog.md 2016-09-19 15:27:12.0
+0200
@@ -1,3 +1,8 @@
+## 1.1.13.3
+
+* `withCheckedProcessCleanup` properly closes opened `Handle`s
+ [#280](https://github.com/snoyberg/conduit/issues/280)
+
## 1.1.13.2
* Fix alignment issues on non-X86 archs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.1.13.2/Data/Conduit/Process.hs
new/conduit-extra-1.1.13.3/Data/Conduit/Process.hs
--- old/conduit-extra-1.1.13.2/Data/Conduit/Process.hs 2016-07-04
08:32:33.0 +0200
+++ new/conduit-extra-1.1.13.3/Data/Conduit/Process.hs 2016-09-19
15:27:12.0 +0200
@@ -31,7 +31,7 @@
import Data.Conduit.Binary (sourceHandle, sinkHandle)
import Data.ByteString (ByteString)
import Control.Concurrent.Async (runConcurrently, Concurrently(..))
-import Control.Monad.Catch (MonadMask, onException, throwM, finally)
+import Control.Monad.Catch (MonadMask, onException, throwM, finally, bracket)
#if (__GLASGOW_HASKELL__ < 710)
import Control.Applicative ((<$>), (<*>))
#endif
@@ -140,13 +140,15 @@
=> CreateProcess
-> (stdin -> stdout -> stderr -> m b)
-> m b
-withCheckedProcessCleanup cp f = do
-(x, y, z, sph) <- streamingProcess cp
-res <- f x y z `onException` liftIO (terminateStreamingProcess sph)
-ec <- waitForStreamingProcess sph
-if ec == ExitSuccess
-then return res
-else throwM $ ProcessExitedUnsuccessfully cp ec
+withCheckedProcessCleanup cp f = bracket
+(streamingProcess cp)
+(\(_, _, _, sph) -> closeStreamingProcessHandle sph)
+$ \(x, y, z, sph) -> do
+res <- f x y z `onException` liftIO (terminateStreamingProcess sph)
+ec <- waitForStreamingProcess sph
+if ec == ExitSuccess
+then return res
+else throwM $ ProcessExitedUnsuccessfully cp ec
terminateStreamingProcess :: StreamingProcessHandle -> IO ()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.1.13.2/conduit-extra.cabal
new/conduit-extra-1.1.13.3/conduit-extra.cabal
--- old/conduit-extra-1.1.13.2/conduit-extra.cabal 2016-07-04
08:32:33.0 +0200
+++
commit ghc-conduit-extra for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-conduit-extra for
openSUSE:Factory checked in at 2016-07-21 08:06:36
Comparing /work/SRC/openSUSE:Factory/ghc-conduit-extra (Old)
and /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new (New)
Package is "ghc-conduit-extra"
Changes:
--- /work/SRC/openSUSE:Factory/ghc-conduit-extra/ghc-conduit-extra.changes
2016-07-12 23:52:47.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new/ghc-conduit-extra.changes
2016-07-21 08:06:43.0 +0200
@@ -1,0 +2,5 @@
+Sun Jul 17 13:17:59 UTC 2016 - psim...@suse.com
+
+- Update to version 1.1.13.2 revision 0 with cabal2obs.
+
+---
Other differences:
--
++ ghc-conduit-extra.spec ++
--- /var/tmp/diff_new_pack.Er3s26/_old 2016-07-21 08:06:44.0 +0200
+++ /var/tmp/diff_new_pack.Er3s26/_new 2016-07-21 08:06:44.0 +0200
@@ -17,22 +17,16 @@
%global pkg_name conduit-extra
-
%bcond_with tests
-
-Name: ghc-conduit-extra
+Name: ghc-%{pkg_name}
Version:1.1.13.2
Release:0
Summary:Batteries included conduit: adapters for common libraries
License:MIT
Group: System/Libraries
-
Url:https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
BuildRequires: ghc-Cabal-devel
-BuildRequires: ghc-rpm-macros
# Begin cabal-rpm deps:
BuildRequires: ghc-async-devel
BuildRequires: ghc-attoparsec-devel
@@ -47,15 +41,16 @@
BuildRequires: ghc-primitive-devel
BuildRequires: ghc-process-devel
BuildRequires: ghc-resourcet-devel
+BuildRequires: ghc-rpm-macros
BuildRequires: ghc-stm-devel
BuildRequires: ghc-streaming-commons-devel
BuildRequires: ghc-text-devel
BuildRequires: ghc-transformers-base-devel
BuildRequires: ghc-transformers-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{with tests}
-BuildRequires: ghc-async-devel
+BuildRequires: ghc-QuickCheck-devel
BuildRequires: ghc-bytestring-builder-devel
-BuildRequires: ghc-exceptions-devel
BuildRequires: ghc-hspec-devel
%endif
# End cabal-rpm deps
@@ -67,33 +62,35 @@
The basic idea is that this package should only depend on haskell-platform
packages and conduit.
-
%package devel
Summary:Haskell %{pkg_name} library development files
Group: Development/Libraries/Other
+Requires: %{name} = %{version}-%{release}
Requires: ghc-compiler = %{ghc_version}
Requires(post): ghc-compiler = %{ghc_version}
Requires(postun): ghc-compiler = %{ghc_version}
-Requires: %{name} = %{version}-%{release}
%description devel
This package provides the Haskell %{pkg_name} library development files.
-
%prep
%setup -q -n %{pkg_name}-%{version}
+
%build
%ghc_lib_build
+
%install
%ghc_lib_install
+
%check
%if %{with tests}
-%cabal test
+%{cabal} test
%endif
+
%post devel
%ghc_pkg_recache
@@ -106,5 +103,6 @@
%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
+%doc ChangeLog.md README.md
%changelog
commit ghc-conduit-extra for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-conduit-extra for
openSUSE:Factory checked in at 2016-07-12 23:52:44
Comparing /work/SRC/openSUSE:Factory/ghc-conduit-extra (Old)
and /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new (New)
Package is "ghc-conduit-extra"
Changes:
--- /work/SRC/openSUSE:Factory/ghc-conduit-extra/ghc-conduit-extra.changes
2016-04-03 23:07:38.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new/ghc-conduit-extra.changes
2016-07-12 23:52:47.0 +0200
@@ -1,0 +2,6 @@
+Sun Jul 10 15:30:34 UTC 2016 - mimi...@gmail.com
+
+- update to 1.1.13.2
+* Fix alignment issues on non-X86 archs
+
+---
Old:
conduit-extra-1.1.13.1.tar.gz
New:
conduit-extra-1.1.13.2.tar.gz
Other differences:
--
++ ghc-conduit-extra.spec ++
--- /var/tmp/diff_new_pack.ITs311/_old 2016-07-12 23:52:48.0 +0200
+++ /var/tmp/diff_new_pack.ITs311/_new 2016-07-12 23:52:48.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-conduit-extra
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
%bcond_with tests
Name: ghc-conduit-extra
-Version:1.1.13.1
+Version:1.1.13.2
Release:0
Summary:Batteries included conduit: adapters for common libraries
License:MIT
++ conduit-extra-1.1.13.1.tar.gz -> conduit-extra-1.1.13.2.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.1.13.1/ChangeLog.md
new/conduit-extra-1.1.13.2/ChangeLog.md
--- old/conduit-extra-1.1.13.1/ChangeLog.md 2016-04-02 19:35:12.0
+0200
+++ new/conduit-extra-1.1.13.2/ChangeLog.md 2016-07-04 08:32:33.0
+0200
@@ -1,3 +1,7 @@
+## 1.1.13.2
+
+* Fix alignment issues on non-X86 archs
+
## 1.1.13.1
* Fix an incorrect comment
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.1.13.1/Data/Conduit/Binary.hs
new/conduit-extra-1.1.13.2/Data/Conduit/Binary.hs
--- old/conduit-extra-1.1.13.1/Data/Conduit/Binary.hs 2016-04-02
19:35:12.0 +0200
+++ new/conduit-extra-1.1.13.2/Data/Conduit/Binary.hs 2016-07-04
08:32:33.0 +0200
@@ -76,6 +76,10 @@
import Control.Monad.Catch (MonadThrow (..))
import Control.Exception (Exception)
import Data.Typeable (Typeable)
+import Foreign.Ptr (Ptr)
+#ifndef ALLOW_UNALIGNED_ACCESS
+import Foreign.Marshal (alloca, copyBytes)
+#endif
-- | Stream the contents of a file as binary data.
--
@@ -501,7 +505,14 @@
-- Given a bytestring of exactly the correct size, grab the value
process bs = return $! wrap $! inlinePerformIO $!
-unsafeUseAsCString bs (peek . castPtr)
+unsafeUseAsCString bs (safePeek undefined . castPtr)
+
+safePeek :: a -> Ptr a -> IO a
+#ifdef ALLOW_UNALIGNED_ACCESS
+safePeek _ = peek
+#else
+safePeek val ptr = alloca (\t -> copyBytes t ptr (sizeOf val) >> peek t)
+#endif
{-# INLINE sinkStorableHelper #-}
data SinkStorableException = SinkStorableInsufficientBytes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.1.13.1/conduit-extra.cabal
new/conduit-extra-1.1.13.2/conduit-extra.cabal
--- old/conduit-extra-1.1.13.1/conduit-extra.cabal 2016-04-02
19:35:12.0 +0200
+++ new/conduit-extra-1.1.13.2/conduit-extra.cabal 2016-07-04
08:32:33.0 +0200
@@ -1,5 +1,5 @@
Name:conduit-extra
-Version: 1.1.13.1
+Version: 1.1.13.2
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.
@@ -33,6 +33,10 @@
if !os(windows)
Exposed-modules: Data.Conduit.Network.Unix
+ if arch(x86_64) || arch(i386)
+ -- These architectures are able to perform unaligned memory accesses
+ cpp-options: -DALLOW_UNALIGNED_ACCESS
+
Build-depends: base >= 4.5 && < 5
, conduit >= 1.1 && < 1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
commit ghc-conduit-extra for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-conduit-extra for
openSUSE:Factory checked in at 2016-04-03 23:07:20
Comparing /work/SRC/openSUSE:Factory/ghc-conduit-extra (Old)
and /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new (New)
Package is "ghc-conduit-extra"
Changes:
--- /work/SRC/openSUSE:Factory/ghc-conduit-extra/ghc-conduit-extra.changes
2016-03-16 10:33:35.0 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new/ghc-conduit-extra.changes
2016-04-03 23:07:38.0 +0200
@@ -1,0 +2,13 @@
+Sun Apr 3 15:14:52 UTC 2016 - mimi...@gmail.com
+
+- update to 1.1.13.1
+* Add sinkStorable and sinkStorableEx
+
+---
+Thu Mar 31 08:36:42 UTC 2016 - mimi...@gmail.com
+
+- update to 1.1.12.1
+* Add sourceProcessWithStreams
+* Fix accidentally breaking change in sourceProcessWithConsumer type signature
+
+---
Old:
conduit-extra-1.1.11.tar.gz
New:
conduit-extra-1.1.13.1.tar.gz
Other differences:
--
++ ghc-conduit-extra.spec ++
--- /var/tmp/diff_new_pack.WmnG3u/_old 2016-04-03 23:07:39.0 +0200
+++ /var/tmp/diff_new_pack.WmnG3u/_new 2016-04-03 23:07:39.0 +0200
@@ -21,7 +21,7 @@
%bcond_with tests
Name: ghc-conduit-extra
-Version:1.1.11
+Version:1.1.13.1
Release:0
Summary:Batteries included conduit: adapters for common libraries
License:MIT
@@ -34,6 +34,7 @@
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
# Begin cabal-rpm deps:
+BuildRequires: ghc-async-devel
BuildRequires: ghc-attoparsec-devel
BuildRequires: ghc-blaze-builder-devel
BuildRequires: ghc-bytestring-devel
++ conduit-extra-1.1.11.tar.gz -> conduit-extra-1.1.13.1.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.1.11/ChangeLog.md
new/conduit-extra-1.1.13.1/ChangeLog.md
--- old/conduit-extra-1.1.11/ChangeLog.md 2016-03-03 10:58:27.0
+0100
+++ new/conduit-extra-1.1.13.1/ChangeLog.md 2016-04-02 19:35:12.0
+0200
@@ -1,3 +1,20 @@
+## 1.1.13.1
+
+* Fix an incorrect comment
+
+## 1.1.13
+
+* Add `sinkStorable` and `sinkStorableEx`
+
+## 1.1.12.1
+
+* Fix build for GHC `<= 7.8`
[#260](https://github.com/snoyberg/conduit/issues/260)
+* Fix accidentally breaking change in `sourceProcessWithConsumer` type
signature
+
+## 1.1.12
+
+* Add sourceProcessWithStreams
[#258](https://github.com/snoyberg/conduit/pull/258)
+
## 1.1.11
* `withCheckedProcessCleanup`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.1.11/Data/Conduit/Attoparsec.hs
new/conduit-extra-1.1.13.1/Data/Conduit/Attoparsec.hs
--- old/conduit-extra-1.1.11/Data/Conduit/Attoparsec.hs 2016-03-03
10:58:27.0 +0100
+++ new/conduit-extra-1.1.13.1/Data/Conduit/Attoparsec.hs 2016-04-02
19:35:12.0 +0200
@@ -105,7 +105,7 @@
f (Position l c) ch | ch == '\n' = Position (l + 1) 0
| otherwise = Position l (c + 1)
stripFromEnd (TI.Text arr1 off1 len1) (TI.Text _ _ len2) =
-TI.textP arr1 off1 (len1 - len2)
+TI.text arr1 off1 (len1 - len2)
-- | Convert an Attoparsec 'A.Parser' into a 'Sink'. The parser will
-- be streamed bytes until it returns 'A.Done' or 'A.Fail'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.1.11/Data/Conduit/Binary.hs
new/conduit-extra-1.1.13.1/Data/Conduit/Binary.hs
--- old/conduit-extra-1.1.11/Data/Conduit/Binary.hs 2016-03-03
10:58:27.0 +0100
+++ new/conduit-extra-1.1.13.1/Data/Conduit/Binary.hs 2016-04-02
19:35:12.0 +0200
@@ -1,4 +1,6 @@
{-# LANGUAGE CPP, RankNTypes #-}
+{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE ScopedTypeVariables #-}
-- | Functions for interacting with bytes.
--
-- For many purposes, it's recommended to use the conduit-combinators library,
@@ -36,6 +38,9 @@
, sinkCacheLength
, sinkLbs
, mapM_
+ -- *** Storable
+, sinkStorable
+, sinkStorableEx
-- ** Conduits
, isolate
, takeWhile
@@ -45,6 +50,7 @@
import qualified Data.Streaming.FileRead as FR
import Prelude hiding (head, take, drop, takeWhile, dropWhile, mapM_)
import qualified Data.ByteString as S
+import Data.ByteString.Unsafe (unsafeUseAsCString)
import qualified Data.ByteString.Lazy as L
import Data.Conduit
import Data.Conduit.List (sourceList, consume)
@@ -55,16 +61,21 @@
import Control.Monad.Trans.Class (lift)
import qualified System.IO as IO
import Data.Word (Word8,
commit ghc-conduit-extra for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-conduit-extra for openSUSE:Factory checked in at 2016-03-16 10:33:34 Comparing /work/SRC/openSUSE:Factory/ghc-conduit-extra (Old) and /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new (New) Package is "ghc-conduit-extra" Changes: --- /work/SRC/openSUSE:Factory/ghc-conduit-extra/ghc-conduit-extra.changes 2016-02-23 16:59:30.0 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new/ghc-conduit-extra.changes 2016-03-16 10:33:35.0 +0100 @@ -1,0 +2,6 @@ +Mon Mar 7 09:32:33 UTC 2016 - mimi...@gmail.com + +- update to 1.1.11 +* withCheckedProcessCleanup + +--- Old: conduit-extra-1.1.10.1.tar.gz New: conduit-extra-1.1.11.tar.gz Other differences: -- ++ ghc-conduit-extra.spec ++ --- /var/tmp/diff_new_pack.hsMZ7L/_old 2016-03-16 10:33:36.0 +0100 +++ /var/tmp/diff_new_pack.hsMZ7L/_new 2016-03-16 10:33:36.0 +0100 @@ -21,7 +21,7 @@ %bcond_with tests Name: ghc-conduit-extra -Version:1.1.10.1 +Version:1.1.11 Release:0 Summary:Batteries included conduit: adapters for common libraries License:MIT @@ -39,6 +39,7 @@ BuildRequires: ghc-bytestring-devel BuildRequires: ghc-conduit-devel BuildRequires: ghc-directory-devel +BuildRequires: ghc-exceptions-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-monad-control-devel BuildRequires: ghc-network-devel ++ conduit-extra-1.1.10.1.tar.gz -> conduit-extra-1.1.11.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conduit-extra-1.1.10.1/ChangeLog.md new/conduit-extra-1.1.11/ChangeLog.md --- old/conduit-extra-1.1.10.1/ChangeLog.md 2016-02-17 12:57:07.0 +0100 +++ new/conduit-extra-1.1.11/ChangeLog.md 2016-03-03 10:58:27.0 +0100 @@ -1,3 +1,7 @@ +## 1.1.11 + +* `withCheckedProcessCleanup` + ## 1.1.10.1 * Fix a leftovers bug in helperDecompress #254 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conduit-extra-1.1.10.1/Data/Conduit/Process.hs new/conduit-extra-1.1.11/Data/Conduit/Process.hs --- old/conduit-extra-1.1.10.1/Data/Conduit/Process.hs 2016-02-17 12:57:07.0 +0100 +++ new/conduit-extra-1.1.11/Data/Conduit/Process.hs2016-03-03 10:58:27.0 +0100 @@ -14,6 +14,7 @@ ( -- * Functions sourceCmdWithConsumer , sourceProcessWithConsumer +, withCheckedProcessCleanup -- * Reexport , module Data.Streaming.Process ) where @@ -26,6 +27,7 @@ import Data.Conduit import Data.Conduit.Binary (sourceHandle, sinkHandle) import Data.ByteString (ByteString) +import Control.Monad.Catch (MonadMask, onException, throwM) instance (r ~ (), MonadIO m, i ~ ByteString) => InputSource (ConduitM i o m r) where isStdStream = (\(Just h) -> return $ sinkHandle h, Just CreatePipe) @@ -57,3 +59,24 @@ -- Since 1.1.2 sourceCmdWithConsumer :: MonadIO m => String -> Consumer ByteString m a -> m (ExitCode, a) sourceCmdWithConsumer cmd = sourceProcessWithConsumer (shell cmd) + +-- | Same as 'withCheckedProcess', but kills the child process in the case of +-- an exception being thrown by the provided callback function. +withCheckedProcessCleanup +:: ( InputSource stdin + , OutputSink stderr + , OutputSink stdout + , MonadIO m + , MonadMask m + ) +=> CreateProcess +-> (stdin -> stdout -> stderr -> m b) +-> m b +withCheckedProcessCleanup cp f = do +(x, y, z, sph) <- streamingProcess cp +res <- f x y z `onException` +liftIO (terminateProcess (streamingProcessHandleRaw sph)) +ec <- waitForStreamingProcess sph +if ec == ExitSuccess +then return res +else throwM $ ProcessExitedUnsuccessfully cp ec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conduit-extra-1.1.10.1/conduit-extra.cabal new/conduit-extra-1.1.11/conduit-extra.cabal --- old/conduit-extra-1.1.10.1/conduit-extra.cabal 2016-02-17 12:57:07.0 +0100 +++ new/conduit-extra-1.1.11/conduit-extra.cabal2016-03-03 10:58:27.0 +0100 @@ -1,5 +1,5 @@ Name:conduit-extra -Version: 1.1.10.1 +Version: 1.1.11 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
commit ghc-conduit-extra for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-conduit-extra for openSUSE:Factory checked in at 2016-02-23 16:57:38 Comparing /work/SRC/openSUSE:Factory/ghc-conduit-extra (Old) and /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new (New) Package is "ghc-conduit-extra" Changes: --- /work/SRC/openSUSE:Factory/ghc-conduit-extra/ghc-conduit-extra.changes 2015-12-09 22:16:59.0 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new/ghc-conduit-extra.changes 2016-02-23 16:59:30.0 +0100 @@ -1,0 +2,11 @@ +Wed Feb 17 09:13:57 UTC 2016 - mimi...@gmail.com + +- update to 1.1.10.1 +* multiple combinator for Data.Conduit.Zlib + +--- +Mon Feb 15 19:54:55 UTC 2016 - mimi...@gmail.com + +- update to 1.1.9.3 + +--- Old: conduit-extra-1.1.9.2.tar.gz New: conduit-extra-1.1.10.1.tar.gz Other differences: -- ++ ghc-conduit-extra.spec ++ --- /var/tmp/diff_new_pack.zhUXtA/_old 2016-02-23 16:59:30.0 +0100 +++ /var/tmp/diff_new_pack.zhUXtA/_new 2016-02-23 16:59:30.0 +0100 @@ -21,7 +21,7 @@ %bcond_with tests Name: ghc-conduit-extra -Version:1.1.9.2 +Version:1.1.10.1 Release:0 Summary:Batteries included conduit: adapters for common libraries License:MIT ++ conduit-extra-1.1.9.2.tar.gz -> conduit-extra-1.1.10.1.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conduit-extra-1.1.9.2/ChangeLog.md new/conduit-extra-1.1.10.1/ChangeLog.md --- old/conduit-extra-1.1.9.2/ChangeLog.md 2015-11-30 07:33:58.0 +0100 +++ new/conduit-extra-1.1.10.1/ChangeLog.md 2016-02-17 12:57:07.0 +0100 @@ -1,3 +1,15 @@ +## 1.1.10.1 + +* Fix a leftovers bug in helperDecompress #254 + +## 1.1.10 + +* `multiple` combinator for `Data.Conduit.Zlib` [#254](https://github.com/snoyberg/conduit/issues/254) + +## 1.1.9.3 + +* Some typo fixes in docs + ## 1.1.9 * detectUtf [#217](https://github.com/snoyberg/conduit/pull/217) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conduit-extra-1.1.9.2/Data/Conduit/Binary.hs new/conduit-extra-1.1.10.1/Data/Conduit/Binary.hs --- old/conduit-extra-1.1.9.2/Data/Conduit/Binary.hs2015-11-30 07:33:58.0 +0100 +++ new/conduit-extra-1.1.10.1/Data/Conduit/Binary.hs 2016-02-17 12:57:07.0 +0100 @@ -129,7 +129,7 @@ -- | An alternative to 'sourceHandle'. -- Instead of taking a pre-opened 'IO.Handle', it takes an action that opens -- a 'IO.Handle' (in read mode), so that it can open it only when needed --- and closed it as soon as possible. +-- and close it as soon as possible. -- -- Since 0.3.0 sourceIOHandle :: MonadResource m @@ -250,7 +250,7 @@ conduitHandle :: MonadIO m => IO.Handle -> Conduit S.ByteString m S.ByteString conduitHandle h = awaitForever $ \bs -> liftIO (S.hPut h bs) >> yield bs --- | Ensure that only up to the given number of bytes are consume by the inner +-- | Ensure that only up to the given number of bytes are consumed by the inner -- sink. Note that this does /not/ ensure that all of those bytes are in fact -- consumed. -- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conduit-extra-1.1.9.2/Data/Conduit/Zlib.hs new/conduit-extra-1.1.10.1/Data/Conduit/Zlib.hs --- old/conduit-extra-1.1.9.2/Data/Conduit/Zlib.hs 2015-11-30 07:33:58.0 +0100 +++ new/conduit-extra-1.1.10.1/Data/Conduit/Zlib.hs 2016-02-17 12:57:07.0 +0100 @@ -8,6 +8,8 @@ compress, decompress, gzip, ungzip, -- * Flushing compressFlush, decompressFlush, +-- * Decompression combinators +multiple, -- * Re-exported from zlib-bindings WindowBits (..), defaultWindowBits ) where @@ -21,6 +23,7 @@ import Control.Monad.Primitive (PrimMonad, unsafePrimToPrim) import Control.Monad.Base (MonadBase, liftBase) import Control.Monad.Trans.Resource (MonadThrow, monadThrow) +import Data.Function (fix) -- | Gzip compression with default parameters. gzip :: (MonadThrow m, MonadBase base m, PrimMonad base) => Conduit ByteString m ByteString @@ -61,39 +64,78 @@ -> (ByteString -> t m ()) -> WindowBits -> t m () -helperDecompress await' yield' leftover' config = -await' >>= maybe (return ()) start - where -start input = do -inf <- lift $ unsafeLiftIO $ initInflate config -push inf input - -rem' <- lift $ unsafeLiftIO $ getUnusedInflate inf -unless (S.null rem') $ leftover' rem' - -
commit ghc-conduit-extra for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-conduit-extra for
openSUSE:Factory checked in at 2015-12-09 19:52:44
Comparing /work/SRC/openSUSE:Factory/ghc-conduit-extra (Old)
and /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new (New)
Package is "ghc-conduit-extra"
Changes:
--- /work/SRC/openSUSE:Factory/ghc-conduit-extra/ghc-conduit-extra.changes
2015-08-05 06:50:50.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new/ghc-conduit-extra.changes
2015-12-09 22:16:59.0 +0100
@@ -1,0 +2,5 @@
+Mon Dec 7 10:41:01 UTC 2015 - mimi...@gmail.com
+
+- update to 1.1.9.2
+
+---
Old:
conduit-extra-1.1.9.1.tar.gz
New:
conduit-extra-1.1.9.2.tar.gz
Other differences:
--
++ ghc-conduit-extra.spec ++
--- /var/tmp/diff_new_pack.tF5ygc/_old 2015-12-09 22:17:00.0 +0100
+++ /var/tmp/diff_new_pack.tF5ygc/_new 2015-12-09 22:17:00.0 +0100
@@ -21,7 +21,7 @@
%bcond_with tests
Name: ghc-conduit-extra
-Version:1.1.9.1
+Version:1.1.9.2
Release:0
Summary:Batteries included conduit: adapters for common libraries
License:MIT
++ conduit-extra-1.1.9.1.tar.gz -> conduit-extra-1.1.9.2.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.1.9.1/Data/Conduit/Lazy.hs
new/conduit-extra-1.1.9.2/Data/Conduit/Lazy.hs
--- old/conduit-extra-1.1.9.1/Data/Conduit/Lazy.hs 2015-07-21
01:38:24.0 +0200
+++ new/conduit-extra-1.1.9.2/Data/Conduit/Lazy.hs 2015-11-30
07:33:58.0 +0100
@@ -1,5 +1,6 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE Trustworthy #-}
-- | Use lazy I\/O for consuming the contents of a source. Warning: All normal
-- warnings of lazy I\/O apply. In particular, if you are using this with a
-- @ResourceT@ transformer, you must force the list to be evaluated before
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.1.9.1/conduit-extra.cabal
new/conduit-extra-1.1.9.2/conduit-extra.cabal
--- old/conduit-extra-1.1.9.1/conduit-extra.cabal 2015-07-21
01:38:24.0 +0200
+++ new/conduit-extra-1.1.9.2/conduit-extra.cabal 2015-11-30
07:33:58.0 +0100
@@ -1,5 +1,5 @@
Name:conduit-extra
-Version: 1.1.9.1
+Version: 1.1.9.2
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.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.1.9.1/test/Data/Conduit/ZlibSpec.hs
new/conduit-extra-1.1.9.2/test/Data/Conduit/ZlibSpec.hs
--- old/conduit-extra-1.1.9.1/test/Data/Conduit/ZlibSpec.hs 2015-07-21
01:38:24.0 +0200
+++ new/conduit-extra-1.1.9.2/test/Data/Conduit/ZlibSpec.hs 2015-11-30
07:33:58.0 +0100
@@ -14,6 +14,7 @@
import Data.Monoid
import qualified Data.ByteString as S
import qualified Data.ByteString.Lazy as L
+import Data.ByteString.Char8 ()
import Data.ByteString.Lazy.Char8 ()
import Control.Monad.Trans.Resource (runExceptionT_)
import Control.Monad.Trans.Class
commit ghc-conduit-extra for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-conduit-extra for openSUSE:Factory checked in at 2015-08-05 06:50:49 Comparing /work/SRC/openSUSE:Factory/ghc-conduit-extra (Old) and /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new (New) Package is ghc-conduit-extra Changes: --- /work/SRC/openSUSE:Factory/ghc-conduit-extra/ghc-conduit-extra.changes 2015-06-09 08:50:24.0 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new/ghc-conduit-extra.changes 2015-08-05 06:50:50.0 +0200 @@ -1,0 +2,5 @@ +Mon Jul 27 07:24:38 UTC 2015 - mimi...@gmail.com + +- update to 1.1.9.1 + +--- Old: conduit-extra-1.1.9.tar.gz New: conduit-extra-1.1.9.1.tar.gz Other differences: -- ++ ghc-conduit-extra.spec ++ --- /var/tmp/diff_new_pack.5nQ7qA/_old 2015-08-05 06:50:50.0 +0200 +++ /var/tmp/diff_new_pack.5nQ7qA/_new 2015-08-05 06:50:50.0 +0200 @@ -21,7 +21,7 @@ %bcond_with tests Name: ghc-conduit-extra -Version:1.1.9 +Version:1.1.9.1 Release:0 Summary:Batteries included conduit: adapters for common libraries License:MIT ++ conduit-extra-1.1.9.tar.gz - conduit-extra-1.1.9.1.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conduit-extra-1.1.9/README.md new/conduit-extra-1.1.9.1/README.md --- old/conduit-extra-1.1.9/README.md 1970-01-01 01:00:00.0 +0100 +++ new/conduit-extra-1.1.9.1/README.md 2015-07-21 01:38:24.0 +0200 @@ -0,0 +1,5 @@ +## conduit-extra + +For more information about conduit in general, and how this package in +particular fits into the ecosystem, see [the conduit +homepage](https://github.com/snoyberg/conduit#readme). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conduit-extra-1.1.9/conduit-extra.cabal new/conduit-extra-1.1.9.1/conduit-extra.cabal --- old/conduit-extra-1.1.9/conduit-extra.cabal 2015-05-27 12:40:54.0 +0200 +++ new/conduit-extra-1.1.9.1/conduit-extra.cabal 2015-07-21 01:38:24.0 +0200 @@ -1,5 +1,5 @@ Name:conduit-extra -Version: 1.1.9 +Version: 1.1.9.1 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. @@ -16,6 +16,7 @@ test/filesystem/*.txt test/filesystem/bin/*.txt ChangeLog.md +README.md Library Exposed-modules: Data.Conduit.Attoparsec
commit ghc-conduit-extra for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-conduit-extra for
openSUSE:Factory checked in at 2015-06-09 08:49:13
Comparing /work/SRC/openSUSE:Factory/ghc-conduit-extra (Old)
and /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new (New)
Package is ghc-conduit-extra
Changes:
--- /work/SRC/openSUSE:Factory/ghc-conduit-extra/ghc-conduit-extra.changes
2015-05-21 08:34:30.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new/ghc-conduit-extra.changes
2015-06-09 08:50:24.0 +0200
@@ -1,0 +2,6 @@
+Sun May 31 20:31:58 UTC 2015 - mimi...@gmail.com
+
+- update to 1.1.9
+* detectUtf
+
+---
Old:
conduit-extra-1.1.8.tar.gz
New:
conduit-extra-1.1.9.tar.gz
Other differences:
--
++ ghc-conduit-extra.spec ++
--- /var/tmp/diff_new_pack.U3rfaS/_old 2015-06-09 08:50:25.0 +0200
+++ /var/tmp/diff_new_pack.U3rfaS/_new 2015-06-09 08:50:25.0 +0200
@@ -21,7 +21,7 @@
%bcond_with tests
Name: ghc-conduit-extra
-Version:1.1.8
+Version:1.1.9
Release:0
Summary:Batteries included conduit: adapters for common libraries
License:MIT
++ conduit-extra-1.1.8.tar.gz - conduit-extra-1.1.9.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.1.8/ChangeLog.md
new/conduit-extra-1.1.9/ChangeLog.md
--- old/conduit-extra-1.1.8/ChangeLog.md2015-05-12 09:11:41.0
+0200
+++ new/conduit-extra-1.1.9/ChangeLog.md2015-05-27 12:40:54.0
+0200
@@ -1,3 +1,7 @@
+## 1.1.9
+
+* detectUtf [#217](https://github.com/snoyberg/conduit/pull/217)
+
## 1.1.8
* Adding buffer size to sourceHandleRange
[#213](https://github.com/snoyberg/conduit/pull/213)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.1.8/Data/Conduit/Text.hs
new/conduit-extra-1.1.9/Data/Conduit/Text.hs
--- old/conduit-extra-1.1.8/Data/Conduit/Text.hs2015-05-12
09:11:41.0 +0200
+++ new/conduit-extra-1.1.9/Data/Conduit/Text.hs2015-05-27
12:40:54.0 +0200
@@ -35,6 +35,7 @@
, Data.Conduit.Text.decodeUtf8
, decodeUtf8Lenient
, encodeUtf8
+, detectUtf
) where
import qualified Prelude
@@ -459,3 +460,34 @@
encodeUtf8 :: Monad m = Conduit T.Text m B.ByteString
encodeUtf8 = CL.map TE.encodeUtf8
{-# INLINE encodeUtf8 #-}
+
+-- | Automatically determine which UTF variant is being used. This function
+-- checks for BOMs, removing them as necessary. It defaults to assuming UTF-8.
+--
+-- Since 1.1.9
+detectUtf :: MonadThrow m = Conduit B.ByteString m T.Text
+detectUtf =
+go id
+ where
+go front = await = maybe (close front) (push front)
+
+push front bs'
+| B.length bs 4 = go $ B.append bs
+| otherwise = leftDecode bs
+ where bs = front bs'
+
+close front = leftDecode $ front B.empty
+
+leftDecode bs = leftover bsOut decode codec
+ where
+bsOut = B.append (B.drop toDrop x) y
+(x, y) = B.splitAt 4 bs
+(toDrop, codec) =
+case B.unpack x of
+[0x00, 0x00, 0xFE, 0xFF] - (4, utf32_be)
+[0xFF, 0xFE, 0x00, 0x00] - (4, utf32_le)
+0xFE : 0xFF: _ - (2, utf16_be)
+0xFF : 0xFE: _ - (2, utf16_le)
+0xEF : 0xBB: 0xBF : _- (3, utf8)
+_- (0, utf8) -- Assuming UTF-8
+{-# INLINE detectUtf #-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.1.8/conduit-extra.cabal
new/conduit-extra-1.1.9/conduit-extra.cabal
--- old/conduit-extra-1.1.8/conduit-extra.cabal 2015-05-12 09:11:41.0
+0200
+++ new/conduit-extra-1.1.9/conduit-extra.cabal 2015-05-27 12:40:54.0
+0200
@@ -1,5 +1,5 @@
Name:conduit-extra
-Version: 1.1.8
+Version: 1.1.9
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.
