Hello community,
here is the log from the commit of package ghc-ndjson-conduit for
openSUSE:Factory checked in at 2016-11-02 12:46:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-ndjson-conduit (Old)
and /work/SRC/openSUSE:Factory/.ghc-ndjson-conduit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-ndjson-conduit"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-ndjson-conduit/ghc-ndjson-conduit.changes
2016-10-22 13:14:02.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-ndjson-conduit.new/ghc-ndjson-conduit.changes
2016-11-02 12:46:45.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Sep 26 06:52:22 UTC 2016 - [email protected]
+
+- Update to version 0.1.0.5 with cabal2obs.
+
+-------------------------------------------------------------------
Old:
----
ndjson-conduit-0.1.0.3.tar.gz
New:
----
ndjson-conduit-0.1.0.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-ndjson-conduit.spec ++++++
--- /var/tmp/diff_new_pack.mZV6bH/_old 2016-11-02 12:46:47.000000000 +0100
+++ /var/tmp/diff_new_pack.mZV6bH/_new 2016-11-02 12:46:47.000000000 +0100
@@ -18,22 +18,20 @@
%global pkg_name ndjson-conduit
Name: ghc-%{pkg_name}
-Version: 0.1.0.3
+Version: 0.1.0.5
Release: 0
Summary: Conduit-based parsing and serialization for newline delimited
JSON
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-aeson-devel
BuildRequires: ghc-attoparsec-devel
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-conduit-devel
BuildRequires: ghc-rpm-macros
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-# End cabal-rpm deps
%description
Hackage documentation generation is not reliable. For up to date documentation,
@@ -53,15 +51,12 @@
%prep
%setup -q -n %{pkg_name}-%{version}
-
%build
%ghc_lib_build
-
%install
%ghc_lib_install
-
%post devel
%ghc_pkg_recache
++++++ ndjson-conduit-0.1.0.3.tar.gz -> ndjson-conduit-0.1.0.5.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ndjson-conduit-0.1.0.3/ndjson-conduit.cabal
new/ndjson-conduit-0.1.0.5/ndjson-conduit.cabal
--- old/ndjson-conduit-0.1.0.3/ndjson-conduit.cabal 2015-12-20
07:47:06.000000000 +0100
+++ new/ndjson-conduit-0.1.0.5/ndjson-conduit.cabal 2016-09-15
14:44:07.000000000 +0200
@@ -1,8 +1,8 @@
--- Initial ndjson-conduit.cabal generated by cabal init. For further
+-- Initial ndjson-conduit.cabal generated by cabal init. For further
-- documentation, see http://haskell.org/cabal/users-guide/
name: ndjson-conduit
-version: 0.1.0.3
+version: 0.1.0.5
synopsis: Conduit-based parsing and serialization for newline
delimited JSON.
description:
Hackage documentation generation is not reliable.
@@ -12,20 +12,20 @@
license-file: LICENSE
author: Sam Rijs
maintainer: [email protected]
--- copyright:
+-- copyright:
category: Data
build-type: Simple
--- extra-source-files:
+-- extra-source-files:
cabal-version: >=1.10
library
exposed-modules: Data.Conduit.JSON.NewlineDelimited
- -- other-modules:
- -- other-extensions:
+ -- other-modules:
+ -- other-extensions:
build-depends: base >=4.6 && <5.0,
aeson >=0.8,
attoparsec >=0.12,
- bytestring >=0.10,
+ bytestring >=0.10.2,
conduit >=1.2
hs-source-dirs: src
default-language: Haskell2010
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ndjson-conduit-0.1.0.3/src/Data/Conduit/JSON/NewlineDelimited.hs
new/ndjson-conduit-0.1.0.5/src/Data/Conduit/JSON/NewlineDelimited.hs
--- old/ndjson-conduit-0.1.0.3/src/Data/Conduit/JSON/NewlineDelimited.hs
2015-12-20 07:47:06.000000000 +0100
+++ new/ndjson-conduit-0.1.0.5/src/Data/Conduit/JSON/NewlineDelimited.hs
2016-09-15 14:43:29.000000000 +0200
@@ -22,7 +22,6 @@
import qualified Data.Aeson as A
import qualified Data.Aeson.Types as A
-import qualified Data.Aeson.Encode as A
import Data.Attoparsec.ByteString
import qualified Data.ByteString as B
import qualified Data.ByteString.Lazy as B (toChunks)
@@ -39,17 +38,12 @@
serializer :: (Monad m, A.ToJSON a) => Conduit a m B.ByteString
serializer = mapInput A.toJSON (const Nothing) valueSerializer
-#if MIN_VERSION_aeson(0,10,0)
-encodeToBuilder = A.encodeToBuilder
-#else
-encodeToBuilder = A.encodeToByteStringBuilder
-#endif
-- | Consumes a stream of aeson values, and provides a stream of bytestrings.
valueSerializer :: Monad m => Conduit A.Value m B.ByteString
valueSerializer = await' $ (>> valueSerializer) . yieldBuilder . build
where yieldBuilder = mapM_ yield . B.toChunks . B.toLazyByteString
- build a = encodeToBuilder a <> B.word8 carriage <> B.word8 newline
+ build a = B.lazyByteString (A.encode a) <> B.word8 carriage <> B.word8
newline
-- | Consumes a stream of bytestrings, and provides a stream of parsed values,
-- ignoring all parse errors.
