Hello community,
here is the log from the commit of package ghc-conduit for openSUSE:Factory
checked in at 2017-05-16 14:45:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-conduit (Old)
and /work/SRC/openSUSE:Factory/.ghc-conduit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-conduit"
Tue May 16 14:45:40 2017 rev:17 rq:494900 version:1.2.10
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-conduit/ghc-conduit.changes 2017-05-06
18:28:12.155493836 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-conduit.new/ghc-conduit.changes
2017-05-16 14:46:39.770419505 +0200
@@ -1,0 +2,5 @@
+Mon Apr 24 12:26:41 UTC 2017 - psim...@suse.com
+
+- Update to version 1.2.10 with cabal2obs.
+
+-------------------------------------------------------------------
Old:
----
conduit-1.2.9.1.tar.gz
New:
----
conduit-1.2.10.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-conduit.spec ++++++
--- /var/tmp/diff_new_pack.MoGQAi/_old 2017-05-16 14:46:40.334340278 +0200
+++ /var/tmp/diff_new_pack.MoGQAi/_new 2017-05-16 14:46:40.338339716 +0200
@@ -19,7 +19,7 @@
%global pkg_name conduit
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 1.2.9.1
+Version: 1.2.10
Release: 0
Summary: Streaming data processing library
License: MIT
@@ -32,6 +32,7 @@
BuildRequires: ghc-mmorph-devel
BuildRequires: ghc-monad-control-devel
BuildRequires: ghc-mtl-devel
+BuildRequires: ghc-primitive-devel
BuildRequires: ghc-resourcet-devel
BuildRequires: ghc-rpm-macros
BuildRequires: ghc-transformers-base-devel
++++++ conduit-1.2.9.1.tar.gz -> conduit-1.2.10.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-1.2.9.1/ChangeLog.md
new/conduit-1.2.10/ChangeLog.md
--- old/conduit-1.2.9.1/ChangeLog.md 2017-04-03 16:37:03.000000000 +0200
+++ new/conduit-1.2.10/ChangeLog.md 2017-04-19 10:46:24.000000000 +0200
@@ -1,3 +1,8 @@
+## 1.2.10
+
+* Add `PrimMonad` instances for `ConduitM` and `Pipe`
+ [#306](https://github.com/snoyberg/conduit/pull/306)
+
## 1.2.9.1
* Ensure downstream and inner sink receive same inputs in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-1.2.9.1/Data/Conduit/Internal/Conduit.hs
new/conduit-1.2.10/Data/Conduit/Internal/Conduit.hs
--- old/conduit-1.2.9.1/Data/Conduit/Internal/Conduit.hs 2017-04-03
16:37:03.000000000 +0200
+++ new/conduit-1.2.10/Data/Conduit/Internal/Conduit.hs 2017-04-19
10:45:43.000000000 +0200
@@ -8,6 +8,7 @@
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE TupleSections #-}
{-# LANGUAGE Trustworthy #-}
+{-# LANGUAGE TypeFamilies #-}
module Data.Conduit.Internal.Conduit
( -- ** Types
ConduitM (..)
@@ -98,6 +99,7 @@
import Control.Monad.Trans.Class (MonadTrans (lift))
import Control.Monad.IO.Class (MonadIO (liftIO))
import Control.Monad.Base (MonadBase (liftBase))
+import Control.Monad.Primitive (PrimMonad, PrimState, primitive)
import Data.Void (Void, absurd)
import Data.Monoid (Monoid (mappend, mempty))
import Control.Monad.Trans.Resource
@@ -251,6 +253,10 @@
mappend = (>>)
{-# INLINE mappend #-}
+instance PrimMonad m => PrimMonad (ConduitM i o m) where
+ type PrimState (ConduitM i o m) = PrimState m
+ primitive = lift . primitive
+
-- | Provides a stream of output values, without consuming any input or
-- producing a final result.
--
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-1.2.9.1/Data/Conduit/Internal/Pipe.hs
new/conduit-1.2.10/Data/Conduit/Internal/Pipe.hs
--- old/conduit-1.2.9.1/Data/Conduit/Internal/Pipe.hs 2016-11-23
07:54:22.000000000 +0100
+++ new/conduit-1.2.10/Data/Conduit/Internal/Pipe.hs 2017-04-19
10:45:49.000000000 +0200
@@ -7,6 +7,7 @@
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE TupleSections #-}
{-# LANGUAGE Trustworthy #-}
+{-# LANGUAGE TypeFamilies #-}
module Data.Conduit.Internal.Pipe
( -- ** Types
Pipe (..)
@@ -55,6 +56,7 @@
import Control.Monad.Trans.Class (MonadTrans (lift))
import Control.Monad.IO.Class (MonadIO (liftIO))
import Control.Monad.Base (MonadBase (liftBase))
+import Control.Monad.Primitive (PrimMonad, PrimState, primitive)
import Data.Void (Void, absurd)
import Data.Monoid (Monoid (mappend, mempty))
import Control.Monad.Trans.Resource
@@ -155,6 +157,10 @@
mappend = (>>)
{-# INLINE mappend #-}
+instance PrimMonad m => PrimMonad (Pipe l i o u m) where
+ type PrimState (Pipe l i o u m) = PrimState m
+ primitive = lift . primitive
+
instance MonadResource m => MonadResource (Pipe l i o u m) where
liftResourceT = lift . liftResourceT
{-# INLINE liftResourceT #-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-1.2.9.1/conduit.cabal
new/conduit-1.2.10/conduit.cabal
--- old/conduit-1.2.9.1/conduit.cabal 2017-04-03 16:37:03.000000000 +0200
+++ new/conduit-1.2.10/conduit.cabal 2017-04-19 10:44:16.000000000 +0200
@@ -1,5 +1,5 @@
Name: conduit
-Version: 1.2.9.1
+Version: 1.2.10
Synopsis: Streaming data processing library.
description:
`conduit` is a solution to the streaming data problem, allowing for
production,
@@ -42,6 +42,7 @@
, mtl
, mmorph
, monad-control
+ , primitive
if !impl(ghc>=7.9)
build-depends: void >= 0.5.5
ghc-options: -Wall
