Hello community,
here is the log from the commit of package ghc-yaml for openSUSE:Factory
checked in at 2017-07-06 00:01:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
and /work/SRC/openSUSE:Factory/.ghc-yaml.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-yaml"
Thu Jul 6 00:01:15 2017 rev:24 rq:506999 version:0.8.23.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes 2017-06-22
10:39:50.486288534 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new/ghc-yaml.changes 2017-07-06
00:01:17.444123630 +0200
@@ -1,0 +2,5 @@
+Mon Jun 19 21:01:49 UTC 2017 - psim...@suse.com
+
+- Update to version 0.8.23.1.
+
+-------------------------------------------------------------------
Old:
----
yaml-0.8.23.tar.gz
New:
----
yaml-0.8.23.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-yaml.spec ++++++
--- /var/tmp/diff_new_pack.7IxzP4/_old 2017-07-06 00:01:18.208016017 +0200
+++ /var/tmp/diff_new_pack.7IxzP4/_new 2017-07-06 00:01:18.212015453 +0200
@@ -19,7 +19,7 @@
%global pkg_name yaml
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 0.8.23
+Version: 0.8.23.1
Release: 0
Summary: Support for parsing and rendering YAML documents
License: BSD-3-Clause
++++++ yaml-0.8.23.tar.gz -> yaml-0.8.23.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yaml-0.8.23/ChangeLog.md
new/yaml-0.8.23.1/ChangeLog.md
--- old/yaml-0.8.23/ChangeLog.md 2017-05-18 17:19:04.000000000 +0200
+++ new/yaml-0.8.23.1/ChangeLog.md 2017-06-16 05:46:31.000000000 +0200
@@ -1,3 +1,7 @@
+## 0.8.23.1
+
+* Update CPP `MIN_VERSION_*` checks
[#109](https://github.com/snoyberg/yaml/pull/109)
+
## 0.8.23
* Re-export the with helpers from aeson
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yaml-0.8.23/Data/Yaml/Builder.hs
new/yaml-0.8.23.1/Data/Yaml/Builder.hs
--- old/yaml-0.8.23/Data/Yaml/Builder.hs 2016-06-20 09:58:03.000000000
+0200
+++ new/yaml-0.8.23.1/Data/Yaml/Builder.hs 2017-06-16 05:46:12.000000000
+0200
@@ -22,7 +22,11 @@
import Control.Arrow (second)
import Control.Monad.Trans.Resource (runResourceT)
+#if MIN_VERSION_aeson(1,0,0)
+import Data.Aeson.Text (encodeToTextBuilder)
+#else
import Data.Aeson.Encode (encodeToTextBuilder)
+#endif
import Data.Aeson.Types (Value(..))
import Data.ByteString (ByteString)
import qualified Data.ByteString.Char8 as S8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yaml-0.8.23/Data/Yaml/Parser.hs
new/yaml-0.8.23.1/Data/Yaml/Parser.hs
--- old/yaml-0.8.23/Data/Yaml/Parser.hs 2016-02-15 10:15:08.000000000 +0100
+++ new/yaml-0.8.23.1/Data/Yaml/Parser.hs 2017-06-16 05:46:12.000000000
+0200
@@ -13,12 +13,7 @@
import Control.Monad.Trans.Writer.Strict (tell, WriterT)
import Data.ByteString (ByteString)
import Data.Conduit
-#if MIN_VERSION_conduit(1,1,0)
import Data.Conduit.Lift (runWriterC)
-#define runWriterSC runWriterC
-#else
-import Data.Conduit.Lift (runWriterSC)
-#endif
import qualified Data.Map as Map
#if !MIN_VERSION_base(4,8,0)
import Data.Monoid (Monoid (..))
@@ -193,7 +188,7 @@
Just e -> monadThrow $ UnexpectedEvent e
sinkRawDoc :: MonadThrow m => Consumer Event m RawDoc
-sinkRawDoc = uncurry RawDoc <$> runWriterSC sinkValue
+sinkRawDoc = uncurry RawDoc <$> runWriterC sinkValue
readYamlFile :: FromYaml a => FilePath -> IO a
readYamlFile fp = runResourceT (decodeFile fp $$ sinkRawDoc) >>= parseRawDoc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yaml-0.8.23/Data/Yaml.hs
new/yaml-0.8.23.1/Data/Yaml.hs
--- old/yaml-0.8.23/Data/Yaml.hs 2017-05-24 16:17:30.000000000 +0200
+++ new/yaml-0.8.23.1/Data/Yaml.hs 2017-06-16 05:46:12.000000000 +0200
@@ -78,7 +78,11 @@
, Object, Array
, withObject, withText, withArray, withScientific, withBool
)
+#if MIN_VERSION_aeson(1,0,0)
+import Data.Aeson.Text (encodeToTextBuilder)
+#else
import Data.Aeson.Encode (encodeToTextBuilder)
+#endif
import Data.Aeson.Types (Pair, parseMaybe, parseEither, Parser)
import Data.ByteString (ByteString)
import qualified Data.Conduit as C
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yaml-0.8.23/Text/Libyaml.hs
new/yaml-0.8.23.1/Text/Libyaml.hs
--- old/yaml-0.8.23/Text/Libyaml.hs 2016-09-19 05:47:16.000000000 +0200
+++ new/yaml-0.8.23.1/Text/Libyaml.hs 2017-06-16 05:46:12.000000000 +0200
@@ -479,12 +479,7 @@
deriving (Show, Typeable)
instance Exception ToEventRawException
-decode :: MonadResource m => B.ByteString
-#if MIN_VERSION_conduit(1, 0, 0)
- -> Producer m Event
-#else
- -> GSource m Event
-#endif
+decode :: MonadResource m => B.ByteString -> Producer m Event
decode bs | B8.null bs = return ()
decode bs =
bracketP alloc cleanup (runParser . fst)
@@ -526,12 +521,7 @@
then withCString openMode $ \openMode' -> c_fdopen fd openMode'
else return nullPtr
-decodeFile :: MonadResource m => FilePath
-#if MIN_VERSION_conduit(1, 0, 0)
- -> Producer m Event
-#else
- -> GSource m Event
-#endif
+decodeFile :: MonadResource m => FilePath -> Producer m Event
decodeFile file =
bracketP alloc cleanup (runParser . fst)
where
@@ -559,12 +549,7 @@
c_yaml_parser_delete ptr
free ptr
-runParser :: MonadResource m => Parser
-#if MIN_VERSION_conduit(1, 0, 0)
- -> Producer m Event
-#else
- -> GSource m Event
-#endif
+runParser :: MonadResource m => Parser -> Producer m Event
runParser parser = do
e <- liftIO $ parserParseOne' parser
case e of
@@ -588,12 +573,7 @@
return $ Left $ YamlParseException problem context problemMark
else Right <$> getEvent er
-encode :: MonadResource m
-#if MIN_VERSION_conduit(1, 0, 0)
- => Consumer Event m ByteString
-#else
- => GSink Event m ByteString
-#endif
+encode :: MonadResource m => Consumer Event m ByteString
encode =
runEmitter alloc close
where
@@ -610,11 +590,7 @@
encodeFile :: MonadResource m
=> FilePath
-#if MIN_VERSION_conduit(1, 0, 0)
-> Consumer Event m ()
-#else
- -> GInfSink Event m
-#endif
encodeFile filePath =
bracketP getFile c_fclose $ \file -> runEmitter (alloc file) (\u _ ->
return u)
where
@@ -628,13 +604,8 @@
runEmitter :: MonadResource m
=> (Emitter -> IO a) -- ^ alloc
-#if MIN_VERSION_conduit(1, 0, 0)
-> (() -> a -> IO b) -- ^ close
-> Consumer Event m b
-#else
- -> (u -> a -> IO b) -- ^ close
- -> Pipe l Event o u m b
-#endif
runEmitter allocI closeI =
bracketP alloc cleanup go
where
@@ -654,11 +625,7 @@
go (emitter, a) =
loop
where
-#if MIN_VERSION_conduit(1, 0, 0)
loop = await >>= maybe (close ()) push
-#else
- loop = awaitE >>= either close push
-#endif
push e = do
_ <- liftIO $ toEventRaw e $ c_yaml_emitter_emit emitter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yaml-0.8.23/yaml.cabal new/yaml-0.8.23.1/yaml.cabal
--- old/yaml-0.8.23/yaml.cabal 2017-05-18 17:18:49.000000000 +0200
+++ new/yaml-0.8.23.1/yaml.cabal 2017-06-16 05:46:34.000000000 +0200
@@ -1,5 +1,5 @@
name: yaml
-version: 0.8.23
+version: 0.8.23.1
license: BSD3
license-file: LICENSE
author: Michael Snoyman <mich...@snoyman.com>, Anton Ageev
<ant...@gmail.com>,Kirill Simonov
