commit ghc-yaml for openSUSE:Factory

2020-08-28 Thread root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2020-08-28 21:41:48

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new.3399 (New)


Package is "ghc-yaml"

Fri Aug 28 21:41:48 2020 rev:35 rq:829508 version:0.11.5.0

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2020-06-19 
17:21:52.667628577 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new.3399/ghc-yaml.changes  
2020-08-28 21:41:51.792897983 +0200
@@ -1,0 +2,18 @@
+Fri Aug 21 11:18:55 UTC 2020 - psim...@suse.com
+
+- Update yaml to version 0.11.5.0.
+  ## 0.11.5.0
+
+  * New functions capable of parsing YAML streams containing multiple 
documents into a list of results:
+* `decodeAllEither'`
+* `decodeAllFileEither`
+* `decodeAllFileWithWarnings`
+* `decodeAllThrow`
+* `decodeAllFileThrow`
+
+---
+Tue Aug 18 10:46:45 UTC 2020 - Peter Simons 
+
+- Replace %setup -q with the more modern %autosetup macro.
+
+---

Old:

  yaml-0.11.4.0.tar.gz

New:

  yaml-0.11.5.0.tar.gz



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.v0Yf8T/_old  2020-08-28 21:41:53.628898659 +0200
+++ /var/tmp/diff_new_pack.v0Yf8T/_new  2020-08-28 21:41:53.628898659 +0200
@@ -19,7 +19,7 @@
 %global pkg_name yaml
 %bcond_with tests
 Name:   ghc-%{pkg_name}
-Version:0.11.4.0
+Version:0.11.5.0
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause
@@ -67,7 +67,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

++ yaml-0.11.4.0.tar.gz -> yaml-0.11.5.0.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.11.4.0/ChangeLog.md 
new/yaml-0.11.5.0/ChangeLog.md
--- old/yaml-0.11.4.0/ChangeLog.md  2020-05-07 10:02:07.0 +0200
+++ new/yaml-0.11.5.0/ChangeLog.md  2020-08-19 14:30:53.0 +0200
@@ -1,5 +1,14 @@
 # ChangeLog for yaml
 
+## 0.11.5.0
+
+* New functions capable of parsing YAML streams containing multiple documents 
into a list of results:
+  * `decodeAllEither'`
+  * `decodeAllFileEither`
+  * `decodeAllFileWithWarnings`
+  * `decodeAllThrow`
+  * `decodeAllFileThrow`
+
 ## 0.11.4.0
 
 * add `ToYaml` instance for `String` 
[#186](https://github.com/snoyberg/yaml/pull/186)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.11.4.0/src/Data/Yaml/Internal.hs 
new/yaml-0.11.5.0/src/Data/Yaml/Internal.hs
--- old/yaml-0.11.4.0/src/Data/Yaml/Internal.hs 2020-03-10 05:49:47.0 
+0100
+++ new/yaml-0.11.5.0/src/Data/Yaml/Internal.hs 2020-08-19 14:30:53.0 
+0200
@@ -11,6 +11,8 @@
 , parse
 , decodeHelper
 , decodeHelper_
+, decodeAllHelper
+, decodeAllHelper_
 , textToScientific
 , stringScalar
 , defaultStringStyle
@@ -56,6 +58,7 @@
 import Data.Text.Encoding.Error (lenientDecode)
 import Data.Typeable
 import qualified Data.Vector as V
+import Data.Void (Void)
 
 import qualified Text.Libyaml as Y
 import Text.Libyaml hiding (encode, decode, encodeFile, decodeFile)
@@ -66,6 +69,7 @@
   , _expected :: Maybe Event
   }
 | InvalidYaml (Maybe YamlException)
+| MultipleDocuments
 | AesonException String
 | OtherParseException SomeException
 | NonStringKey JSONPath
@@ -115,6 +119,7 @@
 _  -> ",\n" ++ context ++ ":\n"
 , problem
 ]
+  MultipleDocuments -> "Multiple YAML documents encountered"
   AesonException s -> "Aeson exception:\n" ++ s
   OtherParseException exc -> "Generic parse exception:\n" ++ show exc
   NonStringKey path -> formatError path "Non-string keys are not supported"
@@ -158,24 +163,34 @@
 
 parse :: ReaderT JSONPath (ConduitM Event o Parse) Value
 parse = do
+docs <- parseAll
+case docs of
+[] -> return Null
+[doc] -> return doc
+_ -> liftIO $ throwIO MultipleDocuments
+
+parseAll :: ReaderT JSONPath (ConduitM Event o Parse) [Value]
+parseAll = do
 streamStart <- lift CL.head
 case streamStart of
 Nothing ->
 -- empty string input
-return Null
-Just EventStreamStart -> do
-documentStart <- lift CL.head
-case documentStart of
-

commit ghc-yaml for openSUSE:Factory

2020-06-19 Thread root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2020-06-19 17:21:47

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new.3606 (New)


Package is "ghc-yaml"

Fri Jun 19 17:21:47 2020 rev:34 rq:815226 version:0.11.4.0

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2020-05-11 
13:37:03.960578283 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new.3606/ghc-yaml.changes  
2020-06-19 17:21:52.667628577 +0200
@@ -1,0 +2,8 @@
+Tue Jun  9 09:10:55 UTC 2020 - psim...@suse.com
+
+- Update yaml to version 0.11.4.0.
+  ## 0.11.4.0
+
+  * add `ToYaml` instance for `String` 
[#186](https://github.com/snoyberg/yaml/pull/186)
+
+---

Old:

  yaml-0.11.3.0.tar.gz

New:

  yaml-0.11.4.0.tar.gz



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.DqzXCU/_old  2020-06-19 17:21:54.555634070 +0200
+++ /var/tmp/diff_new_pack.DqzXCU/_new  2020-06-19 17:21:54.559634081 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package ghc-yaml
 #
-# 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
@@ -19,7 +19,7 @@
 %global pkg_name yaml
 %bcond_with tests
 Name:   ghc-%{pkg_name}
-Version:0.11.3.0
+Version:0.11.4.0
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause

++ yaml-0.11.3.0.tar.gz -> yaml-0.11.4.0.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.11.3.0/ChangeLog.md 
new/yaml-0.11.4.0/ChangeLog.md
--- old/yaml-0.11.3.0/ChangeLog.md  2020-03-10 05:49:47.0 +0100
+++ new/yaml-0.11.4.0/ChangeLog.md  2020-05-07 10:02:07.0 +0200
@@ -1,5 +1,9 @@
 # ChangeLog for yaml
 
+## 0.11.4.0
+
+* add `ToYaml` instance for `String` 
[#186](https://github.com/snoyberg/yaml/pull/186)
+
 ## 0.11.3.0
 
 * Don't wrap up async exceptions 
[#185](https://github.com/snoyberg/yaml/issues/185)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.11.3.0/src/Data/Yaml/Builder.hs 
new/yaml-0.11.4.0/src/Data/Yaml/Builder.hs
--- old/yaml-0.11.3.0/src/Data/Yaml/Builder.hs  2019-11-06 07:51:30.0 
+0100
+++ new/yaml-0.11.4.0/src/Data/Yaml/Builder.hs  2020-05-07 10:02:07.0 
+0200
@@ -75,7 +75,7 @@
 toYaml = array . map toYaml
 instance ToYaml Text where
 toYaml = string
-instance ToYaml String where
+instance {-# OVERLAPPING #-} ToYaml String where
 toYaml = string . T.pack
 instance ToYaml Int where
 toYaml i = YamlBuilder (EventScalar (S8.pack $ show i) NoTag PlainNoTag 
Nothing:)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.11.3.0/yaml.cabal new/yaml-0.11.4.0/yaml.cabal
--- old/yaml-0.11.3.0/yaml.cabal2020-03-10 05:50:08.0 +0100
+++ new/yaml-0.11.4.0/yaml.cabal2020-05-07 10:02:07.0 +0200
@@ -4,10 +4,10 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 4160e171cfd5a87614a9fbf40f548f75306e24d499c44f71c279d15f8c4e2c39
+-- hash: 1f75743c2fefefb33f6f3e8a51fce90cb3f286c975d205d7ded3789d5b15c488
 
 name:   yaml
-version:0.11.3.0
+version:0.11.4.0
 synopsis:   Support for parsing and rendering YAML documents.
 description:README and API documentation are available at 

 category:   Data

commit ghc-yaml for openSUSE:Factory

2020-05-11 Thread root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2020-05-11 13:37:00

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new.2738 (New)


Package is "ghc-yaml"

Mon May 11 13:37:00 2020 rev:33 rq:801067 version:0.11.3.0

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2019-12-27 
13:59:22.856832617 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new.2738/ghc-yaml.changes  
2020-05-11 13:37:03.960578283 +0200
@@ -1,0 +2,8 @@
+Wed May  6 06:54:10 UTC 2020 - psim...@suse.com
+
+- Update yaml to version 0.11.3.0.
+  ## 0.11.3.0
+
+  * Don't wrap up async exceptions 
[#185](https://github.com/snoyberg/yaml/issues/185)
+
+---

Old:

  yaml-0.11.2.0.tar.gz

New:

  yaml-0.11.3.0.tar.gz



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.eQcxxT/_old  2020-05-11 13:37:05.384581268 +0200
+++ /var/tmp/diff_new_pack.eQcxxT/_new  2020-05-11 13:37:05.384581268 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package ghc-yaml
 #
-# 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 yaml
 %bcond_with tests
 Name:   ghc-%{pkg_name}
-Version:0.11.2.0
+Version:0.11.3.0
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause

++ yaml-0.11.2.0.tar.gz -> yaml-0.11.3.0.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.11.2.0/ChangeLog.md 
new/yaml-0.11.3.0/ChangeLog.md
--- old/yaml-0.11.2.0/ChangeLog.md  2019-11-06 07:13:43.0 +0100
+++ new/yaml-0.11.3.0/ChangeLog.md  2020-03-10 05:49:47.0 +0100
@@ -1,5 +1,9 @@
 # ChangeLog for yaml
 
+## 0.11.3.0
+
+* Don't wrap up async exceptions 
[#185](https://github.com/snoyberg/yaml/issues/185)
+
 ## 0.11.2.0
 
 * Reduces some of the code duplication between the `encode` and `encodePretty` 
functions
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.11.2.0/src/Data/Yaml/Internal.hs 
new/yaml-0.11.3.0/src/Data/Yaml/Internal.hs
--- old/yaml-0.11.2.0/src/Data/Yaml/Internal.hs 2019-11-06 07:13:43.0 
+0100
+++ new/yaml-0.11.3.0/src/Data/Yaml/Internal.hs 2020-03-10 05:49:47.0 
+0100
@@ -303,12 +303,13 @@
   -> IO (Either ParseException ([Warning], a))
 decodeHelper_ src = do
 x <- try $ runResourceT $ runStateT (runConduit $ src .| runReaderT parse 
[]) (ParseState Map.empty [])
-return $ case x of
+case x of
 Left e
-| Just pe <- fromException e -> Left pe
-| Just ye <- fromException e -> Left $ InvalidYaml $ Just (ye :: 
YamlException)
-| otherwise -> Left $ OtherParseException e
-Right (y, st) -> either
+| Just pe <- fromException e -> return $ Left pe
+| Just ye <- fromException e -> return $ Left $ InvalidYaml $ Just 
(ye :: YamlException)
+| Just sae <- fromException e -> throwIO (sae :: 
SomeAsyncException)
+| otherwise -> return $ Left $ OtherParseException e
+Right (y, st) -> return $ either
 (Left . AesonException)
 Right
 ((,) (parseStateWarnings st) <$> parseEither parseJSON y)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.11.2.0/yaml.cabal new/yaml-0.11.3.0/yaml.cabal
--- old/yaml-0.11.2.0/yaml.cabal2019-11-06 11:13:39.0 +0100
+++ new/yaml-0.11.3.0/yaml.cabal2020-03-10 05:50:08.0 +0100
@@ -1,13 +1,13 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.31.2.
+-- This file has been generated from package.yaml by hpack version 0.33.0.
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 1755dcdb4772fa7e743958ba68b120522981238fdcdac9fdc7494a36809ff6ae
+-- hash: 4160e171cfd5a87614a9fbf40f548f75306e24d499c44f71c279d15f8c4e2c39
 
 name:   yaml
-version:0.11.2.0
+version:0.11.3.0
 synopsis:   Support for parsing and rendering YAML documents.
 description:README and API documentation are available at 

 category:   Data

commit ghc-yaml for openSUSE:Factory

2019-12-27 Thread root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2019-12-27 13:59:22

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new.6675 (New)


Package is "ghc-yaml"

Fri Dec 27 13:59:22 2019 rev:32 rq:759568 version:0.11.2.0

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2019-08-29 
17:23:38.367306279 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new.6675/ghc-yaml.changes  
2019-12-27 13:59:22.856832617 +0100
@@ -1,0 +2,20 @@
+Fri Nov  8 16:15:17 UTC 2019 - Peter Simons 
+
+- Drop obsolete group attributes.
+
+---
+Thu Nov  7 06:41:50 UTC 2019 - psim...@suse.com
+
+- Update yaml to version 0.11.2.0.
+  ## 0.11.2.0
+
+  * Reduces some of the code duplication between the `encode` and 
`encodePretty` functions
+  * The output of `encodePretty` has been improved:
+  - Multiline strings now use `Literal` style instead of `SingleQuoted`
+  - Special keys are now quoted in mappings 
[#179](https://github.com/snoyberg/yaml/issues/179)
+  * Support for complex keys in mappings: 
[#182](https://github.com/snoyberg/yaml/issues/182)
+  - Adds `complexMapping` function to `Data.Yaml.Builder`
+  - Decode functions now return a `NonStringKey` error when attempting to 
decode a mapping with a complex key as it is not possible to decode these to an 
Aeson `Value`
+  * Adds missing `ToYaml` instances
+
+---

Old:

  yaml-0.11.1.2.tar.gz

New:

  yaml-0.11.2.0.tar.gz



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.qrGwMV/_old  2019-12-27 13:59:23.316832839 +0100
+++ /var/tmp/diff_new_pack.qrGwMV/_new  2019-12-27 13:59:23.320832841 +0100
@@ -19,11 +19,10 @@
 %global pkg_name yaml
 %bcond_with tests
 Name:   ghc-%{pkg_name}
-Version:0.11.1.2
+Version:0.11.2.0
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause
-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
@@ -59,7 +58,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}

++ yaml-0.11.1.2.tar.gz -> yaml-0.11.2.0.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.11.1.2/ChangeLog.md 
new/yaml-0.11.2.0/ChangeLog.md
--- old/yaml-0.11.1.2/ChangeLog.md  2019-08-26 20:14:53.0 +0200
+++ new/yaml-0.11.2.0/ChangeLog.md  2019-11-06 07:13:43.0 +0100
@@ -1,5 +1,16 @@
 # ChangeLog for yaml
 
+## 0.11.2.0
+
+* Reduces some of the code duplication between the `encode` and `encodePretty` 
functions
+* The output of `encodePretty` has been improved:
+- Multiline strings now use `Literal` style instead of `SingleQuoted`
+- Special keys are now quoted in mappings 
[#179](https://github.com/snoyberg/yaml/issues/179)
+* Support for complex keys in mappings: 
[#182](https://github.com/snoyberg/yaml/issues/182)
+- Adds `complexMapping` function to `Data.Yaml.Builder`
+- Decode functions now return a `NonStringKey` error when attempting to 
decode a mapping with a complex key as it is not possible to decode these to an 
Aeson `Value`
+* Adds missing `ToYaml` instances
+
 ## 0.11.1.2
 
 * Compiles with GHC 8.8.1 (`MonadFail` split)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.11.1.2/src/Data/Yaml/Builder.hs 
new/yaml-0.11.2.0/src/Data/Yaml/Builder.hs
--- old/yaml-0.11.1.2/src/Data/Yaml/Builder.hs  2019-08-23 05:30:58.0 
+0200
+++ new/yaml-0.11.2.0/src/Data/Yaml/Builder.hs  2019-11-06 07:13:43.0 
+0100
@@ -9,6 +9,9 @@
 , mapping
 , namedMapping
 , maybeNamedMapping
+, mappingComplex
+, namedMappingComplex
+, maybeNamedMappingComplex
 , array
 , namedArray
 , maybeNamedArray
@@ -37,7 +40,6 @@
 
 import Prelude hiding (null)
 
-import Control.Arrow (second)
 #if MIN_VERSION_aeson(1,0,0)
 import Data.Aeson.Text (encodeToTextBuilder)
 #else
@@ -47,10 +49,9 @@
 import Data.ByteString (ByteString)
 import qualified Data.ByteString.Char8 as S8
 import Data.Conduit
-import qualified Data.HashSet as HashSet
 import Data.Scientific (Scientific)

commit ghc-yaml for openSUSE:Factory

2019-08-29 Thread root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2019-08-29 17:23:34

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new.7948 (New)


Package is "ghc-yaml"

Thu Aug 29 17:23:34 2019 rev:31 rq:726819 version:0.11.1.2

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2019-06-30 
10:21:54.111657531 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new.7948/ghc-yaml.changes  
2019-08-29 17:23:38.367306279 +0200
@@ -1,0 +2,16 @@
+Tue Aug 27 02:01:57 UTC 2019 - psim...@suse.com
+
+- Update yaml to version 0.11.1.2.
+  ## 0.11.1.2
+
+  * Compiles with GHC 8.8.1 (`MonadFail` split)
+
+---
+Sat Aug 24 02:01:14 UTC 2019 - psim...@suse.com
+
+- Update yaml to version 0.11.1.1.
+  ## 0.11.1.1
+
+  * Use the appropriate `Scientific` rendering function to avoid a memory 
overflow when rendering. The previously used function from `aeson` would not 
use scientific notation, and could use large amounts of memory for values such 
as `1e9`.
+
+---

Old:

  yaml-0.11.1.0.tar.gz

New:

  yaml-0.11.1.2.tar.gz



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.0gTmMh/_old  2019-08-29 17:23:39.003306173 +0200
+++ /var/tmp/diff_new_pack.0gTmMh/_new  2019-08-29 17:23:39.003306173 +0200
@@ -19,7 +19,7 @@
 %global pkg_name yaml
 %bcond_with tests
 Name:   ghc-%{pkg_name}
-Version:0.11.1.0
+Version:0.11.1.2
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause

++ yaml-0.11.1.0.tar.gz -> yaml-0.11.1.2.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.11.1.0/ChangeLog.md 
new/yaml-0.11.1.2/ChangeLog.md
--- old/yaml-0.11.1.0/ChangeLog.md  2019-06-28 03:50:21.0 +0200
+++ new/yaml-0.11.1.2/ChangeLog.md  2019-08-26 20:14:53.0 +0200
@@ -1,5 +1,13 @@
 # ChangeLog for yaml
 
+## 0.11.1.2
+
+* Compiles with GHC 8.8.1 (`MonadFail` split)
+
+## 0.11.1.1
+
+* Use the appropriate `Scientific` rendering function to avoid a memory 
overflow when rendering. The previously used function from `aeson` would not 
use scientific notation, and could use large amounts of memory for values such 
as `1e9`.
+
 ## 0.11.1.0
 
 * Better error messages in the `Data.Yaml.Config` module 
[#168](https://github.com/snoyberg/yaml/issues/168)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.11.1.0/src/Data/Yaml/Parser.hs 
new/yaml-0.11.1.2/src/Data/Yaml/Parser.hs
--- old/yaml-0.11.1.0/src/Data/Yaml/Parser.hs   2018-10-12 08:00:28.0 
+0200
+++ new/yaml-0.11.1.2/src/Data/Yaml/Parser.hs   2019-08-26 20:15:41.0 
+0200
@@ -52,6 +52,9 @@
 case f am of
 Left t -> Left t
 Right x -> unYamlParser (g x) am
+#if MIN_VERSION_base(4,13,0)
+instance MonadFail YamlParser where
+#endif
 fail = YamlParser . const . Left . pack
 instance MonadPlus YamlParser where
 mzero = fail "mzero"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.11.1.0/src/Data/Yaml.hs 
new/yaml-0.11.1.2/src/Data/Yaml.hs
--- old/yaml-0.11.1.0/src/Data/Yaml.hs  2018-10-12 08:00:28.0 +0200
+++ new/yaml-0.11.1.2/src/Data/Yaml.hs  2019-08-26 19:52:52.0 +0200
@@ -94,22 +94,18 @@
 , 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 qualified Data.Scientific as S
+import qualified Data.ByteString.Builder.Scientific
 import Data.Aeson.Types (Pair, parseMaybe, parseEither, Parser)
 import Data.ByteString (ByteString)
+import qualified Data.ByteString.Builder as BB
+import qualified Data.ByteString.Lazy as BL
 import Data.Conduit ((.|), runConduitRes)
 import qualified Data.Conduit.List as CL
 import qualified Data.HashMap.Strict as M
 import qualified Data.HashSet as HashSet
 import Data.Text.Encoding (encodeUtf8)
 import qualified Data.Text as T
-import qualified Data.Text.Encoding as TE
-import qualified Data.Text.Lazy as TL
-import Data.Text.Lazy.Builder (toLazyText)
 import qualified Data.Vector as V
 import System.IO.Unsafe (unsafePerformIO)
 import Data.Text (Text)
@@ -220,8 +216,15 @@
 objToEvents' Null rest = EventScalar "null" NullTag PlainNoTag Nothing : 
rest
 objToEvents' (Bool True) rest = EventScalar "true" BoolTag

commit ghc-yaml for openSUSE:Factory

2019-06-30 Thread root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2019-06-30 10:21:52

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new.4615 (New)


Package is "ghc-yaml"

Sun Jun 30 10:21:52 2019 rev:30 rq:712508 version:0.11.1.0

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2018-10-25 
08:19:41.539982456 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new.4615/ghc-yaml.changes  
2019-06-30 10:21:54.111657531 +0200
@@ -1,0 +2,9 @@
+Sat Jun 29 02:01:17 UTC 2019 - psim...@suse.com
+
+- Update yaml to version 0.11.1.0.
+  ## 0.11.1.0
+
+  * Better error messages in the `Data.Yaml.Config` module 
[#168](https://github.com/snoyberg/yaml/issues/168)
+  * Add `LoadSettingsException` exception and remove error printing from 
`loadYamlSettings` [#172](https://github.com/snoyberg/yaml/pull/172)
+
+---

Old:

  yaml-0.11.0.0.tar.gz

New:

  yaml-0.11.1.0.tar.gz



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.YrCj5R/_old  2019-06-30 10:21:56.539661302 +0200
+++ /var/tmp/diff_new_pack.YrCj5R/_new  2019-06-30 10:21:56.567661346 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package ghc-yaml
 #
-# 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 yaml
 %bcond_with tests
 Name:   ghc-%{pkg_name}
-Version:0.11.0.0
+Version:0.11.1.0
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause

++ yaml-0.11.0.0.tar.gz -> yaml-0.11.1.0.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.11.0.0/ChangeLog.md 
new/yaml-0.11.1.0/ChangeLog.md
--- old/yaml-0.11.0.0/ChangeLog.md  2018-10-12 08:00:28.0 +0200
+++ new/yaml-0.11.1.0/ChangeLog.md  2019-06-28 03:50:21.0 +0200
@@ -1,5 +1,10 @@
 # ChangeLog for yaml
 
+## 0.11.1.0
+
+* Better error messages in the `Data.Yaml.Config` module 
[#168](https://github.com/snoyberg/yaml/issues/168)
+* Add `LoadSettingsException` exception and remove error printing from 
`loadYamlSettings` [#172](https://github.com/snoyberg/yaml/pull/172)
+
 ## 0.11.0.0
 
 * Split out the `libyaml` and `Text.Libyaml` code into its own package. 
[#145](https://github.com/snoyberg/yaml/issues/145)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.11.0.0/src/Data/Yaml/Config.hs 
new/yaml-0.11.1.0/src/Data/Yaml/Config.hs
--- old/yaml-0.11.0.0/src/Data/Yaml/Config.hs   2018-10-12 08:00:28.0 
+0200
+++ new/yaml-0.11.1.0/src/Data/Yaml/Config.hs   2019-06-26 15:22:21.0 
+0200
@@ -180,9 +180,7 @@
 runValues <- forM runTimeFiles $ \fp -> do
 eres <- YI.decodeFileEither fp
 case eres of
-Left e -> do
-putStrLn $ "loadYamlSettings: Could not parse file as YAML: " 
++ fp
-throwIO e
+Left e -> throwIO (Y.LoadSettingsException fp e)
 Right value -> return value
 
 value' <-
@@ -197,9 +195,9 @@
 UseCustomEnv env -> return $ applyEnvValue   False env
value'
 RequireCustomEnv env -> return $ applyEnvValue   True  env
value'
 
-case fromJSON value of
-Error s -> error $ "Could not convert to expected type: " ++ s
-Success settings -> return settings
+case Y.parseEither parseJSON value of
+Left s -> error $ "Could not convert to expected type: " ++ s
+Right settings -> return settings
 
 -- | Same as @loadYamlSettings@, but get the list of runtime config files from
 -- the command line arguments.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.11.0.0/src/Data/Yaml/Internal.hs 
new/yaml-0.11.1.0/src/Data/Yaml/Internal.hs
--- old/yaml-0.11.0.0/src/Data/Yaml/Internal.hs 2018-10-12 08:00:28.0 
+0200
+++ new/yaml-0.11.1.0/src/Data/Yaml/Internal.hs 2019-06-26 15:22:21.0 
+0200
@@ -62,6 +62,7 @@
 | OtherParseException SomeException
 | NonStringKeyAlias Y.AnchorName Value
 | CyclicIncludes
+| LoadSettingsException FilePath ParseException
 deriving (Show, Typeable)
 
 instance Exception ParseException where
@@ -113,6 +114,7 @@
 , "  Value: " ++ show value
 ]
   CyclicIncludes ->

commit ghc-yaml for openSUSE:Factory

2018-10-25 Thread root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2018-10-25 08:19:39

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new (New)


Package is "ghc-yaml"

Thu Oct 25 08:19:39 2018 rev:29 rq:642909 version:0.11.0.0

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2018-07-24 
17:23:31.323387149 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new/ghc-yaml.changes   2018-10-25 
08:19:41.539982456 +0200
@@ -1,0 +2,44 @@
+Mon Oct 15 02:01:17 UTC 2018 - psim...@suse.com
+
+- Update yaml to version 0.11.0.0.
+  ## 0.11.0.0
+
+  * Split out the `libyaml` and `Text.Libyaml` code into its own package. 
[#145](https://github.com/snoyberg/yaml/issues/145)
+
+---
+Thu Oct 11 02:01:05 UTC 2018 - psim...@suse.com
+
+- Update yaml to version 0.10.4.0.
+  ## 0.10.4.0
+
+  * Add `decodeMarked` and `decodeFileMarked` functions to `Text.Libyaml`, and
+extend native bindings to extract mark information. 
[#157](https://github.com/snoyberg/yaml/issues/157)
+
+---
+Wed Oct 10 19:23:55 UTC 2018 - psim...@suse.com
+
+- Update yaml to version 0.10.3.0.
+  ## 0.10.3.0
+
+  * Add support for anchors and aliases to Data.Yaml.Builder 
[#155](https://github.com/snoyberg/yaml/pull/155)
+  * Fix test suite for 32 bit machines 
[#158](https://github.com/snoyberg/yaml/issues/158)
+
+  ## 0.10.2.0
+
+  * Add `EncodeOptions` and `FormatOptions` to control the style of the 
encoded YAML. [#153](https://github.com/snoyberg/yaml/pull/153)
+  * Default to using literal style for multiline strings 
[#152](https://github.com/snoyberg/yaml/issues/152)
+
+  ## 0.10.1.1
+
+  * Correctly declare libyaml dependency on system-libyaml flag 
[#151](https://github.com/snoyberg/yaml/pull/151)
+
+  ## 0.10.1
+
+  * Avoid incurring a `semigroups` dependency on recent GHCs.
+  * Fix a space leak that was introduced with `0.10.0` 
[#147](https://github.com/snoyberg/yaml/issues/147)
+
+  ## 0.10.0
+
+  * Add `decodeFileWithWarnings` which returns warnings for duplicate fields
+
+---

Old:

  yaml-0.9.0.tar.gz

New:

  yaml-0.11.0.0.tar.gz



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.neUbAU/_old  2018-10-25 08:19:42.207982160 +0200
+++ /var/tmp/diff_new_pack.neUbAU/_new  2018-10-25 08:19:42.211982158 +0200
@@ -12,14 +12,14 @@
 # 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/
 #
 
 
 %global pkg_name yaml
 %bcond_with tests
 Name:   ghc-%{pkg_name}
-Version:0.9.0
+Version:0.11.0.0
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause
@@ -34,10 +34,11 @@
 BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-directory-devel
 BuildRequires:  ghc-filepath-devel
+BuildRequires:  ghc-libyaml-devel
+BuildRequires:  ghc-mtl-devel
 BuildRequires:  ghc-resourcet-devel
 BuildRequires:  ghc-rpm-macros
 BuildRequires:  ghc-scientific-devel
-BuildRequires:  ghc-semigroups-devel
 BuildRequires:  ghc-template-haskell-devel
 BuildRequires:  ghc-text-devel
 BuildRequires:  ghc-transformers-devel
@@ -48,6 +49,7 @@
 BuildRequires:  ghc-base-compat-devel
 BuildRequires:  ghc-hspec-devel
 BuildRequires:  ghc-mockery-devel
+BuildRequires:  ghc-raw-strings-qq-devel
 BuildRequires:  ghc-temporary-devel
 %endif
 

++ yaml-0.9.0.tar.gz -> yaml-0.11.0.0.tar.gz ++
 14938 lines of diff (skipped)

commit ghc-yaml for openSUSE:Factory

2018-07-24 Thread root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2018-07-24 17:23:29

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new (New)


Package is "ghc-yaml"

Tue Jul 24 17:23:29 2018 rev:28 rq:623900 version:0.9.0

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2018-05-30 
12:28:00.172815882 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new/ghc-yaml.changes   2018-07-24 
17:23:31.323387149 +0200
@@ -1,0 +2,38 @@
+Wed Jul 18 14:26:49 UTC 2018 - psim...@suse.com
+
+- Cosmetic: replace tabs with blanks, strip trailing white space,
+  and update copyright headers with spec-cleaner.
+
+---
+Tue Jul 17 19:31:11 UTC 2018 - psim...@suse.com
+
+- Update yaml to version 0.9.0.
+  # ChangeLog for yaml
+
+  ## 0.9.0
+
+  * Expose style and tags on mappings and sequences in Text.Libyaml 
[#141](https://github.com/snoyberg/yaml/pull/141)
+
+  ## 0.8.32
+
+  * Escape keys as necessary 
[#137](https://github.com/snoyberg/yaml/issues/137)
+  * Support hexadecimal and octal number values 
[#135](https://github.com/snoyberg/yaml/issues/135)
+  * More resilient `isNumeric` (should reduce cases of unneeded quoting)
+  * hpackify
+  * src subdir
+
+---
+Fri Jul 13 14:31:38 UTC 2018 - psim...@suse.com
+
+- Update yaml to version 0.8.31.1.
+  ## 0.8.31.1
+
+  * Add a workaround for a cabal bug 
[haskell-infra/hackage-trustees#165](https://github.com/haskell-infra/hackage-trustees/issues/165)
+
+  ## 0.8.31
+
+  * Add `decodeThrow` and `decodeFileThrow` convenience functions.
+  * Upgrade libyaml versions
+  * Deprecate `decode` and `decodeEither`
+
+---
@@ -183 +220,0 @@
-

Old:

  yaml-0.8.30.tar.gz

New:

  yaml-0.9.0.tar.gz



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.KU3krJ/_old  2018-07-24 17:23:32.255388339 +0200
+++ /var/tmp/diff_new_pack.KU3krJ/_new  2018-07-24 17:23:32.255388339 +0200
@@ -19,7 +19,7 @@
 %global pkg_name yaml
 %bcond_with tests
 Name:   ghc-%{pkg_name}
-Version:0.8.30
+Version:0.9.0
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause

++ yaml-0.8.30.tar.gz -> yaml-0.9.0.tar.gz ++
 5573 lines of diff (skipped)

commit ghc-yaml for openSUSE:Factory

2018-05-30 Thread root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2018-05-30 12:16:07

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new (New)


Package is "ghc-yaml"

Wed May 30 12:16:07 2018 rev:27 rq:607958 version:0.8.30

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2017-09-15 
22:27:45.485497850 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new/ghc-yaml.changes   2018-05-30 
12:28:00.172815882 +0200
@@ -1,0 +2,17 @@
+Mon May 14 17:02:11 UTC 2018 - psim...@suse.com
+
+- Update yaml to version 0.8.30.
+  * Removed `AppSettings` mentioned in `loadYamlSettings` error message.
+  * Deprecated `decodeFile` [#129](https://github.com/snoyberg/yaml/issues/129)
+  * Turn off executables by default 
[#103](https://github.com/snoyberg/yaml/issues/103)
+  * Add `Data.Yaml.TH.yamlQQ`
+  * Support conduit 1.3
+  * Add `Semigroup` instance [#123](https://github.com/snoyberg/yaml/pull/123)
+  * Use `throwM` instead of `monadThrow`
+  * Drop aeson-qq dep (incompatible with Stackage Nightly)
+  * Tweaks to the executable `yaml2json` 
[#119](https://github.com/snoyberg/yaml/pull/119): 
+  - Add command-line option `-h` and `--help` to show help message
+  - Error messages are now written to `stderr` instead of `stdout`
+  * New encodePretty option `setConfDropNull` to drop null values from objects 
[#116](https://github.com/snoyberg/yaml/issues/116)
+
+---

Old:

  yaml-0.8.23.3.tar.gz

New:

  yaml-0.8.30.tar.gz



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.7InOm0/_old  2018-05-30 12:28:00.920789482 +0200
+++ /var/tmp/diff_new_pack.7InOm0/_new  2018-05-30 12:28:00.924789341 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package ghc-yaml
 #
-# 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,14 +19,13 @@
 %global pkg_name yaml
 %bcond_with tests
 Name:   ghc-%{pkg_name}
-Version:0.8.23.3
+Version:0.8.30
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause
 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:  chrpath
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-aeson-devel
 BuildRequires:  ghc-attoparsec-devel
@@ -46,7 +45,6 @@
 BuildRequires:  ghc-vector-devel
 %if %{with tests}
 BuildRequires:  ghc-HUnit-devel
-BuildRequires:  ghc-aeson-qq-devel
 BuildRequires:  ghc-base-compat-devel
 BuildRequires:  ghc-hspec-devel
 BuildRequires:  ghc-mockery-devel
@@ -54,7 +52,8 @@
 %endif
 
 %description
-Support for parsing and rendering YAML documents.
+README and API documentation are available at
+.
 
 %package devel
 Summary:Haskell %{pkg_name} library development files
@@ -75,7 +74,6 @@
 
 %install
 %ghc_lib_install
-%ghc_fix_rpath %{pkg_name}-%{version}
 
 %check
 %cabal_test
@@ -87,11 +85,9 @@
 %ghc_pkg_recache
 
 %files -f %{name}.files
-%doc LICENSE
-%{_bindir}/json2yaml
-%{_bindir}/yaml2json
+%license LICENSE
 
 %files devel -f %{name}-devel.files
-%doc ChangeLog.md README.md examples
+%doc ChangeLog.md README.md
 
 %changelog

++ yaml-0.8.23.3.tar.gz -> yaml-0.8.30.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.23.3/ChangeLog.md 
new/yaml-0.8.30/ChangeLog.md
--- old/yaml-0.8.23.3/ChangeLog.md  2017-07-14 09:17:46.0 +0200
+++ new/yaml-0.8.30/ChangeLog.md2018-05-04 07:36:29.0 +0200
@@ -1,3 +1,42 @@
+## 0.8.30
+
+* Removed `AppSettings` mentioned in `loadYamlSettings` error message.
+
+## 0.8.29
+
+* Deprecated `decodeFile` [#129](https://github.com/snoyberg/yaml/issues/129)
+* Turn off executables by default 
[#103](https://github.com/snoyberg/yaml/issues/103)
+
+## 0.8.28
+
+* Add `Data.Yaml.TH.yamlQQ`
+
+## 0.8.27
+
+* Support conduit 1.3
+
+## 0.8.26
+
+* Add `Semigroup` instance [#123](https://github.com/snoyberg/yaml/pull/123)
+
+## 0.8.25.2
+
+* Use `throwM` instead of `monadThrow`
+
+## 0.8.25.1
+
+* Drop aeson-qq dep (incompatible with Stackage Nightly)
+
+## 0.8.25
+
+* Tweaks to the executable `yaml2json` 
[#119](https://github.com/snoyberg/yaml/pull/119): 
+- Add command-line option `-h` and `--help` to

commit ghc-yaml for openSUSE:Factory

2017-09-15 Thread root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2017-09-15 22:27:44

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new (New)


Package is "ghc-yaml"

Fri Sep 15 22:27:44 2017 rev:26 rq:525736 version:0.8.23.3

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2017-07-23 
12:15:39.605063923 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new/ghc-yaml.changes   2017-09-15 
22:27:45.485497850 +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-yaml.spec ++
--- /var/tmp/diff_new_pack.VM7s0o/_old  2017-09-15 22:27:46.113409393 +0200
+++ /var/tmp/diff_new_pack.VM7s0o/_new  2017-09-15 22:27:46.117408830 +0200
@@ -23,8 +23,8 @@
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause
-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:  chrpath
 BuildRequires:  ghc-Cabal-devel
@@ -44,7 +44,6 @@
 BuildRequires:  ghc-transformers-devel
 BuildRequires:  ghc-unordered-containers-devel
 BuildRequires:  ghc-vector-devel
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 %if %{with tests}
 BuildRequires:  ghc-HUnit-devel
 BuildRequires:  ghc-aeson-qq-devel
@@ -59,7 +58,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}
@@ -88,13 +87,11 @@
 %ghc_pkg_recache
 
 %files -f %{name}.files
-%defattr(-,root,root,-)
 %doc LICENSE
 %{_bindir}/json2yaml
 %{_bindir}/yaml2json
 
 %files devel -f %{name}-devel.files
-%defattr(-,root,root,-)
 %doc ChangeLog.md README.md examples
 
 %changelog

commit ghc-yaml for openSUSE:Factory

2017-07-23 Thread root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2017-07-23 12:15:39

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new (New)


Package is "ghc-yaml"

Sun Jul 23 12:15:39 2017 rev:25 rq:511926 version:0.8.23.3

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2017-07-06 
00:01:17.444123630 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new/ghc-yaml.changes   2017-07-23 
12:15:39.605063923 +0200
@@ -1,0 +2,5 @@
+Mon Jul 17 03:01:35 UTC 2017 - psim...@suse.com
+
+- Update to version 0.8.23.3.
+
+---

Old:

  yaml-0.8.23.1.tar.gz

New:

  yaml-0.8.23.3.tar.gz



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.MCNQ9R/_old  2017-07-23 12:15:40.156985962 +0200
+++ /var/tmp/diff_new_pack.MCNQ9R/_new  2017-07-23 12:15:40.156985962 +0200
@@ -19,7 +19,7 @@
 %global pkg_name yaml
 %bcond_with tests
 Name:   ghc-%{pkg_name}
-Version:0.8.23.1
+Version:0.8.23.3
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause

++ yaml-0.8.23.1.tar.gz -> yaml-0.8.23.3.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.23.1/ChangeLog.md 
new/yaml-0.8.23.3/ChangeLog.md
--- old/yaml-0.8.23.1/ChangeLog.md  2017-06-16 05:46:31.0 +0200
+++ new/yaml-0.8.23.3/ChangeLog.md  2017-07-14 09:17:46.0 +0200
@@ -1,3 +1,11 @@
+## 0.8.23.3
+
+* Avoid over-escaping `*` [#113](https://github.com/snoyberg/yaml/issues/113)
+
+## 0.8.23.2
+
+* Update libyaml [#110](https://github.com/snoyberg/yaml/issues/110)
+
 ## 0.8.23.1
 
 * Update CPP `MIN_VERSION_*` checks 
[#109](https://github.com/snoyberg/yaml/pull/109)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.23.1/Data/Yaml/Internal.hs 
new/yaml-0.8.23.3/Data/Yaml/Internal.hs
--- old/yaml-0.8.23.1/Data/Yaml/Internal.hs 2017-05-14 05:27:45.0 
+0200
+++ new/yaml-0.8.23.3/Data/Yaml/Internal.hs 2017-07-14 09:17:05.0 
+0200
@@ -281,7 +281,7 @@
 -- | Strings which must be escaped so as not to be treated as non-string 
scalars.
 specialStrings :: HashSet.HashSet Text
 specialStrings = HashSet.fromList $ T.words
-"y Y yes Yes YES n N no No NO true True TRUE false False FALSE on On ON 
off Off OFF null Null NULL ~"
+"y Y yes Yes YES n N no No NO true True TRUE false False FALSE on On ON 
off Off OFF null Null NULL ~ *"
 
 isNumeric :: Text -> Bool
 isNumeric t =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.23.1/libyaml/scanner.c 
new/yaml-0.8.23.3/libyaml/scanner.c
--- old/yaml-0.8.23.1/libyaml/scanner.c 2017-02-16 18:25:11.0 +0100
+++ new/yaml-0.8.23.3/libyaml/scanner.c 2017-06-30 06:02:56.0 +0200
@@ -3284,6 +3284,11 @@
 
 /* Check if we are at the end of the scalar. */
 
+/* Fix for crash unitialized value crash
+ * Credit for the bug and input is to OSS Fuzz
+ * Credit for the fix to Alex Gaynor
+ */
+if (!CACHE(parser, 1)) goto error;
 if (CHECK(parser->buffer, single ? '\'' : '"'))
 break;
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.23.1/libyaml/yaml.h 
new/yaml-0.8.23.3/libyaml/yaml.h
--- old/yaml-0.8.23.1/libyaml/yaml.h2017-02-16 18:25:11.0 +0100
+++ new/yaml-0.8.23.3/libyaml/yaml.h2017-06-30 06:02:56.0 +0200
@@ -26,10 +26,9 @@
 
 /** The public API declaration. */
 
-/* __MINGW32__ definition added for Haskell yaml package */
 #if defined(__MINGW32__)
 #   define  YAML_DECLARE(type)  type
-#elif _WIN32
+#elif defined(WIN32)
 #   if defined(YAML_DECLARE_STATIC)
 #   define  YAML_DECLARE(type)  type
 #   elif defined(YAML_DECLARE_EXPORT)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.23.1/test/Data/YamlSpec.hs 
new/yaml-0.8.23.3/test/Data/YamlSpec.hs
--- old/yaml-0.8.23.1/test/Data/YamlSpec.hs 2017-05-14 05:25:46.0 
+0200
+++ new/yaml-0.8.23.3/test/Data/YamlSpec.hs 2017-07-14 09:16:04.0 
+0200
@@ -116,6 +116,7 @@
 it "True" $ D.encode (object ["foo" .= True]) `shouldBe` "foo: true\n"
 it "False" $ D.encode (object ["foo" .= False]) `shouldBe` "foo: 
false\n"
 it "simple string" $ D.encode (object ["foo" .= ("bar" :: T.Text)]) 
`shouldBe` "foo: bar\n"
+it "*" $ D.encode (object ["foo" .= ("*" :: T.Text)]) `shouldBe` "foo: 
'*'\n"

commit ghc-yaml for openSUSE:Factory

2017-07-05 Thread root 
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.changes2017-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.md2017-05-18 17:19:04.0 +0200
+++ new/yaml-0.8.23.1/ChangeLog.md  2017-06-16 05:46:31.0 +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.hs2016-06-20 09:58:03.0 
+0200
+++ new/yaml-0.8.23.1/Data/Yaml/Builder.hs  2017-06-16 05:46:12.0 
+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.0 +0100
+++ new/yaml-0.8.23.1/Data/Yaml/Parser.hs   2017-06-16 05:46:12.0 
+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.hs2017-05-24 16:17:30.0 +0200
+++ new/yaml-0.8.23.1/Data/Yaml.hs  2017-06-16 05:46:12.0 +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.0 +0200
+++ new/yaml-0.8.23.1/Text/Libyaml.hs   2017-06-16 05:46:12.0 +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

commit ghc-yaml for openSUSE:Factory

2017-06-22 Thread root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2017-06-22 10:39:49

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new (New)


Package is "ghc-yaml"

Thu Jun 22 10:39:49 2017 rev:23 rq:504123 version:0.8.23

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2017-06-04 
01:59:26.303511699 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new/ghc-yaml.changes   2017-06-22 
10:39:50.486288534 +0200
@@ -1,0 +2,5 @@
+Wed May 31 14:01:08 UTC 2017 - psim...@suse.com
+
+- Update to version 0.8.23.
+
+---

Old:

  yaml-0.8.22.1.tar.gz

New:

  yaml-0.8.23.tar.gz



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.PhNe4T/_old  2017-06-22 10:39:51.582134034 +0200
+++ /var/tmp/diff_new_pack.PhNe4T/_new  2017-06-22 10:39:51.586133470 +0200
@@ -19,7 +19,7 @@
 %global pkg_name yaml
 %bcond_with tests
 Name:   ghc-%{pkg_name}
-Version:0.8.22.1
+Version:0.8.23
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause

++ yaml-0.8.22.1.tar.gz -> yaml-0.8.23.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.22.1/ChangeLog.md 
new/yaml-0.8.23/ChangeLog.md
--- old/yaml-0.8.22.1/ChangeLog.md  2017-05-14 05:28:34.0 +0200
+++ new/yaml-0.8.23/ChangeLog.md2017-05-18 17:19:04.0 +0200
@@ -1,3 +1,7 @@
+## 0.8.23
+
+* Re-export the with helpers from aeson
+
 ## 0.8.22.1
 
 * Make numeric string detection slightly smarter so, e.g., `.` does
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.22.1/Data/Yaml.hs 
new/yaml-0.8.23/Data/Yaml.hs
--- old/yaml-0.8.22.1/Data/Yaml.hs  2016-04-11 08:46:19.0 +0200
+++ new/yaml-0.8.23/Data/Yaml.hs2017-05-24 16:17:30.0 +0200
@@ -42,6 +42,12 @@
 , (.:)
 , (.:?)
 , (.!=)
+  -- ** With helpers (since 0.8.23)
+, withObject
+, withText
+, withArray
+, withScientific
+, withBool
   -- * Parsing
 , parseMonad
 , parseEither
@@ -70,6 +76,7 @@
 ( Value (..), ToJSON (..), FromJSON (..), object
 , (.=) , (.:) , (.:?) , (.!=)
 , Object, Array
+, withObject, withText, withArray, withScientific, withBool
 )
 import Data.Aeson.Encode (encodeToTextBuilder)
 import Data.Aeson.Types (Pair, parseMaybe, parseEither, Parser)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.22.1/yaml.cabal new/yaml-0.8.23/yaml.cabal
--- old/yaml-0.8.22.1/yaml.cabal2017-05-14 05:28:14.0 +0200
+++ new/yaml-0.8.23/yaml.cabal  2017-05-18 17:18:49.0 +0200
@@ -1,5 +1,5 @@
 name:yaml
-version: 0.8.22.1
+version: 0.8.23
 license: BSD3
 license-file:LICENSE
 author:  Michael Snoyman , Anton Ageev 
,Kirill Simonov

commit ghc-yaml for openSUSE:Factory

2017-06-03 Thread root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2017-06-04 01:59:25

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new (New)


Package is "ghc-yaml"

Sun Jun  4 01:59:25 2017 rev:22 rq:499742 version:0.8.22.1

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2017-03-20 
17:08:20.376233074 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new/ghc-yaml.changes   2017-06-04 
01:59:26.303511699 +0200
@@ -1,0 +2,5 @@
+Thu May 18 09:52:25 UTC 2017 - psim...@suse.com
+
+- Update to version 0.8.22.1 with cabal2obs.
+
+---

Old:

  yaml-0.8.22.tar.gz

New:

  yaml-0.8.22.1.tar.gz



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.Iddjx2/_old  2017-06-04 01:59:26.883429772 +0200
+++ /var/tmp/diff_new_pack.Iddjx2/_new  2017-06-04 01:59:26.887429207 +0200
@@ -19,7 +19,7 @@
 %global pkg_name yaml
 %bcond_with tests
 Name:   ghc-%{pkg_name}
-Version:0.8.22
+Version:0.8.22.1
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause
@@ -55,7 +55,7 @@
 %endif
 
 %description
-Please see the README.md file.
+Support for parsing and rendering YAML documents.
 
 %package devel
 Summary:Haskell %{pkg_name} library development files

++ yaml-0.8.22.tar.gz -> yaml-0.8.22.1.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.22/ChangeLog.md 
new/yaml-0.8.22.1/ChangeLog.md
--- old/yaml-0.8.22/ChangeLog.md2017-02-16 10:53:35.0 +0100
+++ new/yaml-0.8.22.1/ChangeLog.md  2017-05-14 05:28:34.0 +0200
@@ -1,3 +1,8 @@
+## 0.8.22.1
+
+* Make numeric string detection slightly smarter so, e.g., `.` does
+  not get quoted
+
 ## 0.8.22
 
 * Update to libyaml hosted on Github 
[#105](https://github.com/snoyberg/yaml/issues/105)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.22/Data/Yaml/Internal.hs 
new/yaml-0.8.22.1/Data/Yaml/Internal.hs
--- old/yaml-0.8.22/Data/Yaml/Internal.hs   2017-02-16 18:22:54.0 
+0100
+++ new/yaml-0.8.22.1/Data/Yaml/Internal.hs 2017-05-14 05:27:45.0 
+0200
@@ -284,10 +284,11 @@
 "y Y yes Yes YES n N no No NO true True TRUE false False FALSE on On ON 
off Off OFF null Null NULL ~"
 
 isNumeric :: Text -> Bool
-isNumeric =
-T.all isNumeric'
+isNumeric t =
+T.all isNumeric' t && T.any isNumber t
   where
-isNumeric' c = ('0' <= c && c <= '9')
+isNumber c = '0' <= c && c <= '9'
+isNumeric' c = isNumber c
 || c == 'e'
 || c == 'E'
 || c == '.'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.22/test/Data/YamlSpec.hs 
new/yaml-0.8.22.1/test/Data/YamlSpec.hs
--- old/yaml-0.8.22/test/Data/YamlSpec.hs   2017-02-16 10:46:12.0 
+0100
+++ new/yaml-0.8.22.1/test/Data/YamlSpec.hs 2017-05-14 05:25:46.0 
+0200
@@ -70,6 +70,7 @@
 it "encode/decode strings" caseEncodeDecodeStrings
 it "decode invalid file" caseDecodeInvalid
 it "processes datatypes" caseDataTypes
+it "encode invalid numbers" caseEncodeInvalidNumbers
 describe "Data.Yaml.Pretty" $ do
 it "encode/decode" caseEncodeDecodeDataPretty
 it "encode/decode strings" caseEncodeDecodeStringsPretty
@@ -434,6 +435,10 @@
 , ("null", D.Null)
 ]
 
+caseEncodeInvalidNumbers :: Assertion
+caseEncodeInvalidNumbers =
+D.encode (D.String ".") @?= ".\n"
+
 caseDataTypesPretty :: Assertion
 caseDataTypesPretty =
 D.decode (Pretty.encodePretty Pretty.defConfig val) @?= Just val
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.22/yaml.cabal new/yaml-0.8.22.1/yaml.cabal
--- old/yaml-0.8.22/yaml.cabal  2017-02-16 18:04:57.0 +0100
+++ new/yaml-0.8.22.1/yaml.cabal2017-05-14 05:28:14.0 +0200
@@ -1,5 +1,5 @@
 name:yaml
-version: 0.8.22
+version: 0.8.22.1
 license: BSD3
 license-file:LICENSE
 author:  Michael Snoyman , Anton Ageev 
,Kirill Simonov

commit ghc-yaml for openSUSE:Factory

2017-03-20 Thread root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2017-03-20 17:08:20

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new (New)


Package is "ghc-yaml"

Mon Mar 20 17:08:20 2017 rev:21 rq:477472 version:0.8.22

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2017-02-22 
13:54:03.335868047 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new/ghc-yaml.changes   2017-03-20 
17:08:20.376233074 +0100
@@ -1,0 +2,5 @@
+Mon Feb 27 10:12:13 UTC 2017 - psim...@suse.com
+
+- Update to version 0.8.22 with cabal2obs.
+
+---

Old:

  yaml-0.8.21.2.tar.gz

New:

  yaml-0.8.22.tar.gz



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.rhoaq1/_old  2017-03-20 17:08:21.248109966 +0100
+++ /var/tmp/diff_new_pack.rhoaq1/_new  2017-03-20 17:08:21.252109401 +0100
@@ -19,7 +19,7 @@
 %global pkg_name yaml
 %bcond_with tests
 Name:   ghc-%{pkg_name}
-Version:0.8.21.2
+Version:0.8.22
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause
@@ -34,7 +34,6 @@
 BuildRequires:  ghc-conduit-devel
 BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-directory-devel
-BuildRequires:  ghc-enclosed-exceptions-devel
 BuildRequires:  ghc-filepath-devel
 BuildRequires:  ghc-resourcet-devel
 BuildRequires:  ghc-rpm-macros

++ yaml-0.8.21.2.tar.gz -> yaml-0.8.22.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.21.2/ChangeLog.md 
new/yaml-0.8.22/ChangeLog.md
--- old/yaml-0.8.21.2/ChangeLog.md  2017-01-25 12:17:27.0 +0100
+++ new/yaml-0.8.22/ChangeLog.md2017-02-16 10:53:35.0 +0100
@@ -1,3 +1,7 @@
+## 0.8.22
+
+* Update to libyaml hosted on Github 
[#105](https://github.com/snoyberg/yaml/issues/105)
+
 ## 0.8.21.2
 
 * Fix wrong file not found exception in `Data.Yaml.Include` with pre-1.2.3.0 
`directory` [#104](https://github.com/snoyberg/yaml/pull/104)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.21.2/Data/Yaml/Internal.hs 
new/yaml-0.8.22/Data/Yaml/Internal.hs
--- old/yaml-0.8.21.2/Data/Yaml/Internal.hs 2016-11-27 13:18:47.0 
+0100
+++ new/yaml-0.8.22/Data/Yaml/Internal.hs   2017-02-16 18:22:54.0 
+0100
@@ -17,7 +17,6 @@
 import Control.Applicative ((<$>), Applicative(..))
 #endif
 import Control.Exception
-import Control.Exception.Enclosed
 import Control.Monad (liftM, ap, unless)
 import Control.Monad.IO.Class (MonadIO, liftIO)
 import Control.Monad.Trans.Class (MonadTrans, lift)
@@ -253,7 +252,10 @@
  => C.Source Parse Y.Event
  -> IO (Either ParseException (Either String a))
 decodeHelper src = do
-x <- tryAny $ runResourceT $ flip evalStateT Map.empty $ src C.$$ parse
+-- This used to be tryAny, but the fact is that catching async
+-- exceptions is fine here. We'll rethrow them immediately in the
+-- otherwise clause.
+x <- try $ runResourceT $ flip evalStateT Map.empty $ src C.$$ parse
 case x of
 Left e
 | Just pe <- fromException e -> return $ Left pe
@@ -265,7 +267,7 @@
   => C.Source Parse Event
   -> IO (Either ParseException a)
 decodeHelper_ src = do
-x <- tryAny $ runResourceT $ flip evalStateT Map.empty $ src C.$$ parse
+x <- try $ runResourceT $ flip evalStateT Map.empty $ src C.$$ parse
 return $ case x of
 Left e
 | Just pe <- fromException e -> Left pe
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.21.2/libyaml/LICENSE 
new/yaml-0.8.22/libyaml/LICENSE
--- old/yaml-0.8.21.2/libyaml/LICENSE   2016-02-15 10:15:08.0 +0100
+++ new/yaml-0.8.22/libyaml/LICENSE 2017-02-16 18:25:11.0 +0100
@@ -1,4 +1,4 @@
-Copyright (c) 2006 Kirill Simonov
+Copyright (c) 2006-2016 Kirill Simonov
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.21.2/libyaml/api.c 
new/yaml-0.8.22/libyaml/api.c
--- old/yaml-0.8.21.2/libyaml/api.c 2016-10-18 16:06:29.0 +0200
+++ new/yaml-0.8.22/libyaml/api.c   2017-02-16 18:25:11.0 +0100
@@ -5,15 +5,6 @@
  * Get the library version.
  */
 
-/*
- * added to support _WIN64
- */
-#if _WIN64
-#define STRDUP _strdup
-#else
-#define STRDUP strdup
-#endif
-

commit ghc-yaml for openSUSE:Factory

2017-02-22 Thread root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2017-02-22 13:54:02

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new (New)


Package is "ghc-yaml"

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2017-01-12 
15:53:12.433777668 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new/ghc-yaml.changes   2017-02-22 
13:54:03.335868047 +0100
@@ -1,0 +2,5 @@
+Mon Jan 30 09:29:22 UTC 2017 - psim...@suse.com
+
+- Update to version 0.8.21.2 with cabal2obs.
+
+---

Old:

  yaml-0.8.21.1.tar.gz

New:

  yaml-0.8.21.2.tar.gz



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.C4OvGf/_old  2017-02-22 13:54:04.071763335 +0100
+++ /var/tmp/diff_new_pack.C4OvGf/_new  2017-02-22 13:54:04.075762766 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package ghc-yaml
 #
-# 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
@@ -19,7 +19,7 @@
 %global pkg_name yaml
 %bcond_with tests
 Name:   ghc-%{pkg_name}
-Version:0.8.21.1
+Version:0.8.21.2
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause

++ yaml-0.8.21.1.tar.gz -> yaml-0.8.21.2.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.21.1/ChangeLog.md 
new/yaml-0.8.21.2/ChangeLog.md
--- old/yaml-0.8.21.1/ChangeLog.md  2016-11-29 10:43:02.0 +0100
+++ new/yaml-0.8.21.2/ChangeLog.md  2017-01-25 12:17:27.0 +0100
@@ -1,3 +1,7 @@
+## 0.8.21.2
+
+* Fix wrong file not found exception in `Data.Yaml.Include` with pre-1.2.3.0 
`directory` [#104](https://github.com/snoyberg/yaml/pull/104)
+
 ## 0.8.21.1
 
 * Add missing test files [#102](https://github.com/snoyberg/yaml/pull/102)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.21.1/Data/Yaml/Include.hs 
new/yaml-0.8.21.2/Data/Yaml/Include.hs
--- old/yaml-0.8.21.1/Data/Yaml/Include.hs  2016-11-29 10:43:02.0 
+0100
+++ new/yaml-0.8.21.2/Data/Yaml/Include.hs  2017-01-25 12:17:27.0 
+0100
@@ -1,6 +1,13 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE RankNTypes #-}
 module Data.Yaml.Include (decodeFile, decodeFileEither) where
 
+#if !MIN_VERSION_directory(1, 2, 3)
+import Control.Exception (handleJust)
+import Control.Monad (guard)
+import System.IO.Error (ioeGetFileName, ioeGetLocation, isDoesNotExistError)
+#endif
+
 import Control.Exception (throwIO)
 import Control.Monad (when)
 import Control.Monad.IO.Class (liftIO)
@@ -25,7 +32,7 @@
   where
 go :: MonadResource m => [FilePath] -> FilePath -> Producer m Event
 go seen fp = do
-cfp <- liftIO $ canonicalizePath fp
+cfp <- liftIO $ handleNotFound $ canonicalizePath fp
 when (cfp `elem` seen) $ do
 liftIO $ throwIO CyclicIncludes
 Y.decodeFile cfp $= do
@@ -37,6 +44,17 @@
 
 irrelevantEvents = [EventStreamStart, EventDocumentStart, 
EventDocumentEnd, EventStreamEnd]
 
+#if !MIN_VERSION_directory(1, 2, 3)
+handleNotFound = handleJust
+(\e -> do
+guard (isDoesNotExistError e)
+guard (ioeGetLocation e == "canonicalizePath")
+ioeGetFileName e)
+(throwIO . YamlException . ("Yaml file not found: " ++))
+#else
+handleNotFound = id
+#endif
+
 -- | Like `Data.Yaml.decodeFile` but with support for relative and absolute
 -- includes.
 --
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.21.1/test/Data/Yaml/IncludeSpec.hs 
new/yaml-0.8.21.2/test/Data/Yaml/IncludeSpec.hs
--- old/yaml-0.8.21.1/test/Data/Yaml/IncludeSpec.hs 2016-11-29 
10:43:02.0 +0100
+++ new/yaml-0.8.21.2/test/Data/Yaml/IncludeSpec.hs 2017-01-25 
12:17:27.0 +0100
@@ -2,12 +2,12 @@
 module Data.Yaml.IncludeSpec (main, spec) where
 
 import   Test.Hspec
-import   Data.Either.Compat
+import   Data.List (isPrefixOf)
 import   Data.Aeson
 import   Data.Aeson.QQ
-import   Data.Yaml (ParseException)
-
+import   Data.Yaml (ParseException(InvalidYaml))
 import   Data.Yaml.Include
+import   Text.Libyaml (YamlException(YamlException))
 
 main :: IO ()
 main = hspec spec
@@ -38,7 +38,17 @@
 it "aborts on cyclic includes" $ do
   (decodeFile

commit ghc-yaml for openSUSE:Factory

2016-11-05 Thread h_root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2016-11-05 21:26:53

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new (New)


Package is "ghc-yaml"

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2016-10-23 
12:51:06.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new/ghc-yaml.changes   2016-11-05 
21:26:54.0 +0100
@@ -1,0 +2,5 @@
+Thu Oct 27 15:55:14 UTC 2016 - psim...@suse.com
+
+- Update to version 0.8.20 with cabal2obs.
+
+---

Old:

  yaml-0.8.18.7.tar.gz

New:

  yaml-0.8.20.tar.gz



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.rfhiwM/_old  2016-11-05 21:26:55.0 +0100
+++ /var/tmp/diff_new_pack.rfhiwM/_new  2016-11-05 21:26:55.0 +0100
@@ -19,7 +19,7 @@
 %global pkg_name yaml
 %bcond_with tests
 Name:   ghc-%{pkg_name}
-Version:0.8.18.7
+Version:0.8.20
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause
@@ -40,6 +40,7 @@
 BuildRequires:  ghc-rpm-macros
 BuildRequires:  ghc-scientific-devel
 BuildRequires:  ghc-semigroups-devel
+BuildRequires:  ghc-template-haskell-devel
 BuildRequires:  ghc-text-devel
 BuildRequires:  ghc-transformers-devel
 BuildRequires:  ghc-unordered-containers-devel

++ yaml-0.8.18.7.tar.gz -> yaml-0.8.20.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.18.7/ChangeLog.md 
new/yaml-0.8.20/ChangeLog.md
--- old/yaml-0.8.18.7/ChangeLog.md  2016-09-19 06:40:50.0 +0200
+++ new/yaml-0.8.20/ChangeLog.md2016-10-19 18:31:16.0 +0200
@@ -1,3 +1,11 @@
+## 0.8.20
+
+* Upgrade to libyaml 0.1.7
+
+## 0.8.19.0
+
+* Add `Data.Yaml.TH` module
+
 ## 0.8.18.7
 
 * Add `O_TRUNC` when opening files
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.18.7/Data/Yaml/TH.hs 
new/yaml-0.8.20/Data/Yaml/TH.hs
--- old/yaml-0.8.18.7/Data/Yaml/TH.hs   1970-01-01 01:00:00.0 +0100
+++ new/yaml-0.8.20/Data/Yaml/TH.hs 2016-10-19 18:31:16.0 +0200
@@ -0,0 +1,44 @@
+{-# LANGUAGE LambdaCase  #-}
+{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TemplateHaskell #-}
+
+module Data.Yaml.TH
+  ( -- * Decoding
+decodeFile
+-- * Re-exports from "Data.Yaml"
+  , Value (..)
+  , Parser
+  , Object
+  , Array
+  , object
+  , array
+  , (.=)
+  , (.:)
+  , (.:?)
+  , (.!=)
+  , FromJSON (..)
+  ) where
+
+import Data.Yaml hiding (decodeFile)
+import Language.Haskell.TH
+import Language.Haskell.TH.Syntax
+
+-- | Decode a @yaml@ file at compile time. Only available on GHC version 
@7.8.1@
+-- or higher.
+--
+-- @since 0.8.19.0
+--
+--  __Examples__
+--
+-- @
+-- {-\# LANGUAGE TemplateHaskell \#-}
+--
+-- config :: Config
+-- config = $$('decodeFile' "config.yaml")
+-- @
+decodeFile :: forall a. (Lift a, FromJSON a) => FilePath -> Q (TExp a)
+decodeFile path = do
+  addDependentFile path
+  runIO (decodeFileEither path) >>= \case
+Left err -> fail (prettyPrintParseException err)
+Right x -> fmap TExp (lift (x :: a))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.18.7/README.md new/yaml-0.8.20/README.md
--- old/yaml-0.8.18.7/README.md 2016-09-19 06:40:50.0 +0200
+++ new/yaml-0.8.20/README.md   2016-10-19 18:31:16.0 +0200
@@ -2,7 +2,7 @@
 
 Provides support for parsing and emitting Yaml documents.
 
-This package includes the [full libyaml C library version 0.1.5 by Kirill 
Simonov](http://pyyaml.org/wiki/LibYAML) in the package so you don't need to 
worry about any non-Haskell dependencies.
+This package includes the [full libyaml C library version 0.1.7 by Kirill 
Simonov](http://pyyaml.org/wiki/LibYAML) in the package so you don't need to 
worry about any non-Haskell dependencies.
 
 The package is broken down into two primary modules. `Data.Yaml` provides a 
high-level interface based around the JSON datatypes provided by the `aeson` 
package. `Text.Libyaml` provides a lower-level, streaming interface. For most 
users, `Data.Yaml` is recommended.
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.18.7/libyaml/api.c 
new/yaml-0.8.20/libyaml/api.c
--- old/yaml-0.8.18.7/libyaml/api.c 2016-09-19 06:40:50.0 +0200
+++ new/yaml-0.8.20/libyaml/api.c   2016-10-19 18:31:16.0 +0200
@@ -424,7 +424,7 @@
 {
 yaml_emitter_t *emitter = data;
 
-if (emitter->output.string.size +

commit ghc-yaml for openSUSE:Factory

2016-10-23 Thread h_root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2016-10-23 12:51:05

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new (New)


Package is "ghc-yaml"

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2016-09-05 
21:19:27.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new/ghc-yaml.changes   2016-10-23 
12:51:06.0 +0200
@@ -1,0 +2,10 @@
+Mon Sep 26 06:52:12 UTC 2016 - psim...@suse.com
+
+- Update to version 0.8.18.7 with cabal2obs.
+
+---
+Thu Sep 15 06:35:46 UTC 2016 - psim...@suse.com
+
+- Update to version 0.8.18.6 revision 0 with cabal2obs.
+
+---

Old:

  yaml-0.8.18.1.tar.gz

New:

  yaml-0.8.18.7.tar.gz



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.IkIETt/_old  2016-10-23 12:51:07.0 +0200
+++ /var/tmp/diff_new_pack.IkIETt/_new  2016-10-23 12:51:07.0 +0200
@@ -19,11 +19,11 @@
 %global pkg_name yaml
 %bcond_with tests
 Name:   ghc-%{pkg_name}
-Version:0.8.18.1
+Version:0.8.18.7
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause
-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:  chrpath
@@ -51,6 +51,7 @@
 BuildRequires:  ghc-base-compat-devel
 BuildRequires:  ghc-hspec-devel
 BuildRequires:  ghc-mockery-devel
+BuildRequires:  ghc-temporary-devel
 %endif
 
 %description
@@ -70,20 +71,16 @@
 %prep
 %setup -q -n %{pkg_name}-%{version}
 
-
 %build
 %ghc_lib_build
 
-
 %install
 %ghc_lib_install
 %ghc_fix_dynamic_rpath json2yaml yaml2json
 
-
 %check
 %cabal_test
 
-
 %post devel
 %ghc_pkg_recache
 

++ yaml-0.8.18.1.tar.gz -> yaml-0.8.18.7.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.18.1/ChangeLog.md 
new/yaml-0.8.18.7/ChangeLog.md
--- old/yaml-0.8.18.1/ChangeLog.md  2016-07-19 17:43:07.0 +0200
+++ new/yaml-0.8.18.7/ChangeLog.md  2016-09-19 06:40:50.0 +0200
@@ -1,3 +1,24 @@
+## 0.8.18.7
+
+* Add `O_TRUNC` when opening files
+
+## 0.8.18.6
+
+* s/fdopen/_fdopen on Windows [#96](https://github.com/snoyberg/yaml/issues/96)
+
+## 0.8.18.5
+
+* Properly fix previous bug (fixes #94)
+
+## 0.8.18.4
+
+* Remove file with non-ASCII name due to Stack/cabal-install/Hackage
+  restrictions (see [#92](https://github.com/snoyberg/yaml/issues/92))
+
+## 0.8.18.2
+
+* Handle non-ASCII filenames correctly on Windows 
[#91](https://github.com/snoyberg/yaml/pull/91)
+
 ## 0.8.18.1
 
 * Improve prettyPrintParseException when context is empty 
[#89](https://github.com/snoyberg/yaml/pull/89)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.18.1/Text/Libyaml.hs 
new/yaml-0.8.18.7/Text/Libyaml.hs
--- old/yaml-0.8.18.1/Text/Libyaml.hs   2016-07-19 17:43:07.0 +0200
+++ new/yaml-0.8.18.7/Text/Libyaml.hs   2016-09-19 06:40:50.0 +0200
@@ -29,6 +29,7 @@
 
 import Prelude hiding (pi)
 
+import Data.Bits ((.|.))
 import Foreign.C
 import Foreign.Ptr
 import Foreign.ForeignPtr
@@ -36,6 +37,7 @@
 import Foreign.ForeignPtr.Unsafe
 #endif
 import Foreign.Marshal.Alloc
+import qualified System.Posix.Internals as Posix
 
 #if !MIN_VERSION_base(4,8,0)
 import Control.Applicative
@@ -147,11 +149,14 @@
 data FileStruct
 type File = Ptr FileStruct
 
-foreign import ccall unsafe "fopen"
-c_fopen :: Ptr CChar
--> Ptr CChar
--> IO File
-
+#ifdef WINDOWS
+foreign import ccall unsafe "_fdopen"
+#else
+foreign import ccall unsafe "fdopen"
+#endif
+c_fdopen :: CInt
+ -> Ptr CChar
+ -> IO File
 foreign import ccall unsafe "fclose"
 c_fclose :: File
  -> IO ()
@@ -503,6 +508,24 @@
 c_yaml_parser_delete ptr
 free ptr
 
+-- XXX copied from GHC.IO.FD
+std_flags, read_flags, output_flags, write_flags :: CInt
+std_flags= Posix.o_NOCTTY
+output_flags = std_flags.|. Posix.o_CREAT .|. Posix.o_TRUNC
+read_flags   = std_flags.|. Posix.o_RDONLY
+write_flags  = output_flags .|. Posix.o_WRONLY
+
+-- | Open a C FILE* from a file path, using internal GHC API to work correctly
+-- on all platforms, even on non-ASCII filenames. The opening mode must be
+-- indicated via both 'rawOpenFlags' and 'openMode'.
+openFile :: FilePath -> CInt ->

commit ghc-yaml for openSUSE:Factory

2016-09-05 Thread h_root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2016-09-05 21:19:22

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new (New)


Package is "ghc-yaml"

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2016-07-21 
08:01:42.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new/ghc-yaml.changes   2016-09-05 
21:19:27.0 +0200
@@ -1,0 +2,5 @@
+Fri Jul 22 06:03:43 UTC 2016 - psim...@suse.com
+
+- Update to version 0.8.18.1 revision 0 with cabal2obs.
+
+---

Old:

  yaml-0.8.18.tar.gz

New:

  yaml-0.8.18.1.tar.gz



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.1gy2Bn/_old  2016-09-05 21:19:28.0 +0200
+++ /var/tmp/diff_new_pack.1gy2Bn/_new  2016-09-05 21:19:28.0 +0200
@@ -19,14 +19,13 @@
 %global pkg_name yaml
 %bcond_with tests
 Name:   ghc-%{pkg_name}
-Version:0.8.18
+Version:0.8.18.1
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause
 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
-# Begin cabal-rpm deps:
 BuildRequires:  chrpath
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-aeson-devel
@@ -53,7 +52,6 @@
 BuildRequires:  ghc-hspec-devel
 BuildRequires:  ghc-mockery-devel
 %endif
-# End cabal-rpm deps
 
 %description
 Please see the README.md file.
@@ -79,14 +77,11 @@
 
 %install
 %ghc_lib_install
-
 %ghc_fix_dynamic_rpath json2yaml yaml2json
 
 
 %check
-%if %{with tests}
-%{cabal} test
-%endif
+%cabal_test
 
 
 %post devel

++ yaml-0.8.18.tar.gz -> yaml-0.8.18.1.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.18/ChangeLog.md 
new/yaml-0.8.18.1/ChangeLog.md
--- old/yaml-0.8.18/ChangeLog.md2016-06-21 18:52:49.0 +0200
+++ new/yaml-0.8.18.1/ChangeLog.md  2016-07-19 17:43:07.0 +0200
@@ -1,3 +1,7 @@
+## 0.8.18.1
+
+* Improve prettyPrintParseException when context is empty 
[#89](https://github.com/snoyberg/yaml/pull/89)
+
 ## 0.8.18
 
 * Switched yaml decode function for config file readers in `Data.Yaml.Config` 
to
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.18/Data/Yaml/Internal.hs 
new/yaml-0.8.18.1/Data/Yaml/Internal.hs
--- old/yaml-0.8.18/Data/Yaml/Internal.hs   2016-06-21 18:52:49.0 
+0200
+++ new/yaml-0.8.18.1/Data/Yaml/Internal.hs 2016-07-19 17:43:07.0 
+0200
@@ -88,11 +88,13 @@
 Nothing -> "Unspecified YAML error"
 Just yamlError -> case yamlError of
   YamlException s -> "YAML exception:\n" ++ s
-  YamlParseException problem context mark -> unlines
+  YamlParseException problem context mark -> concat
 [ "YAML parse exception at line " ++ show (yamlLine mark) ++
-  ", column " ++ show (yamlColumn mark) ++ ","
--- The context seems to include a leading "while" or similar.
-, context ++ ":"
+  ", column " ++ show (yamlColumn mark)
+, case context of
+"" -> ":\n"
+-- The context seems to include a leading "while" or similar.
+_  -> ",\n" ++ context ++ ":\n"
 , problem
 ]
   AesonException s -> "Aeson exception:\n" ++ s
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.18/yaml.cabal new/yaml-0.8.18.1/yaml.cabal
--- old/yaml-0.8.18/yaml.cabal  2016-06-21 18:52:49.0 +0200
+++ new/yaml-0.8.18.1/yaml.cabal2016-07-19 17:43:07.0 +0200
@@ -1,5 +1,5 @@
 name:yaml
-version: 0.8.18
+version: 0.8.18.1
 license: BSD3
 license-file:LICENSE
 author:  Michael Snoyman , Anton Ageev 
,Kirill Simonov

commit ghc-yaml for openSUSE:Factory

2016-07-21 Thread h_root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2016-07-21 08:01:36

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new (New)


Package is "ghc-yaml"

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2016-07-01 
09:58:54.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new/ghc-yaml.changes   2016-07-21 
08:01:42.0 +0200
@@ -1,0 +2,5 @@
+Sun Jul 10 17:27:47 UTC 2016 - psim...@suse.com
+
+- Update to version 0.8.18 revision 0 with cabal2obs.
+
+---



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.trJL5C/_old  2016-07-21 08:01:44.0 +0200
+++ /var/tmp/diff_new_pack.trJL5C/_new  2016-07-21 08:01:44.0 +0200
@@ -17,25 +17,26 @@
 
 
 %global pkg_name yaml
-Name:   ghc-yaml
+%bcond_with tests
+Name:   ghc-%{pkg_name}
 Version:0.8.18
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause
 Group:  System/Libraries
-Url:http://hackage.haskell.org/package/%{pkg_name}
-Source0:
http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-# End cabal-rpm deps
+Url:https://hackage.haskell.org/package/%{pkg_name}
+Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
+# Begin cabal-rpm deps:
 BuildRequires:  chrpath
 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-containers-devel
+BuildRequires:  ghc-directory-devel
 BuildRequires:  ghc-enclosed-exceptions-devel
-BuildRequires:  ghc-raw-strings-qq-devel
+BuildRequires:  ghc-filepath-devel
 BuildRequires:  ghc-resourcet-devel
 BuildRequires:  ghc-rpm-macros
 BuildRequires:  ghc-scientific-devel
@@ -44,40 +45,49 @@
 BuildRequires:  ghc-transformers-devel
 BuildRequires:  ghc-unordered-containers-devel
 BuildRequires:  ghc-vector-devel
-BuildRequires:  libyaml-devel
-BuildRequires:  pkgconfig(pkg-config)
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+%if %{with tests}
+BuildRequires:  ghc-HUnit-devel
+BuildRequires:  ghc-aeson-qq-devel
+BuildRequires:  ghc-base-compat-devel
+BuildRequires:  ghc-hspec-devel
+BuildRequires:  ghc-mockery-devel
+%endif
+# End cabal-rpm deps
 
 %description
-Provides support for parsing and emitting Yaml documents.
-
-The package is broken down into two modules.
-"Data.Yaml" provides a high-level interface based
-around the JSON datatypes provided by the 'aeson'
-package. "Text.Libyaml" provides a lower-level,
-streaming interface. For most users, "Data.Yaml" is recommended.
+Please see the README.md file.
 
 %package devel
-Summary:Haskell %{name} library development files
+Summary:Haskell %{pkg_name} library development files
 Group:  Development/Libraries/Other
 Requires:   %{name} = %{version}-%{release}
 Requires:   ghc-compiler = %{ghc_version}
-Requires:   libyaml-devel
+Requires(post): ghc-compiler = %{ghc_version}
+Requires(postun): ghc-compiler = %{ghc_version}
 
 %description devel
-This package provides the Haskell yaml library development files.
+This package provides the Haskell %{pkg_name} library development files.
 
 %prep
 %setup -q -n %{pkg_name}-%{version}
 
+
 %build
-%define cabal_configure_options -f system-libyaml
 %ghc_lib_build
 
+
 %install
 %ghc_lib_install
-%ghc_fix_dynamic_rpath yaml2json
-%ghc_fix_dynamic_rpath json2yaml
+
+%ghc_fix_dynamic_rpath json2yaml yaml2json
+
+
+%check
+%if %{with tests}
+%{cabal} test
+%endif
+
 
 %post devel
 %ghc_pkg_recache
@@ -88,10 +98,11 @@
 %files -f %{name}.files
 %defattr(-,root,root,-)
 %doc LICENSE
-%{_bindir}/yaml2json
 %{_bindir}/json2yaml
+%{_bindir}/yaml2json
 
 %files devel -f %{name}-devel.files
 %defattr(-,root,root,-)
+%doc ChangeLog.md README.md examples
 
 %changelog

commit ghc-yaml for openSUSE:Factory

2016-07-01 Thread h_root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2016-07-01 09:58:53

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new (New)


Package is "ghc-yaml"

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2016-06-14 
23:08:33.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new/ghc-yaml.changes   2016-07-01 
09:58:54.0 +0200
@@ -1,0 +2,7 @@
+Mon Jun 27 11:04:26 UTC 2016 - mimi...@gmail.com
+
+- update to 0.8.18
+* Switched yaml decode function for config file readers in Data.Yaml.Config
+to the one from Data.Yaml.Include that supports !include syntax. 
+
+---

Old:

  yaml-0.8.17.2.tar.gz

New:

  yaml-0.8.18.tar.gz



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.Sa5kQT/_old  2016-07-01 09:58:55.0 +0200
+++ /var/tmp/diff_new_pack.Sa5kQT/_new  2016-07-01 09:58:55.0 +0200
@@ -18,7 +18,7 @@
 
 %global pkg_name yaml
 Name:   ghc-yaml
-Version:0.8.17.2
+Version:0.8.18
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause

++ yaml-0.8.17.2.tar.gz -> yaml-0.8.18.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.17.2/ChangeLog.md 
new/yaml-0.8.18/ChangeLog.md
--- old/yaml-0.8.17.2/ChangeLog.md  2016-06-09 20:40:20.0 +0200
+++ new/yaml-0.8.18/ChangeLog.md2016-06-21 18:52:49.0 +0200
@@ -1,3 +1,8 @@
+## 0.8.18
+
+* Switched yaml decode function for config file readers in `Data.Yaml.Config` 
to
+  the one from `Data.Yaml.Include` that supports `!include` syntax.
+
 ## 0.8.17.2
 
 * Fix pretty-printing order of UnexpectedEvent's fields (fixes 
[#84](https://github.com/snoyberg/yaml/issues/84)) 
[#85](https://github.com/snoyberg/yaml/pull/85)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.17.2/Data/Yaml/Config.hs 
new/yaml-0.8.18/Data/Yaml/Config.hs
--- old/yaml-0.8.17.2/Data/Yaml/Config.hs   2016-06-09 20:40:20.0 
+0200
+++ new/yaml-0.8.18/Data/Yaml/Config.hs 2016-06-21 18:52:49.0 +0200
@@ -41,6 +41,7 @@
 import Control.Exception (throwIO)
 import Data.Text.Encoding (encodeUtf8)
 import qualified Data.Yaml as Y
+import qualified Data.Yaml.Include as YI
 import Data.Maybe (fromMaybe)
 import qualified Data.Text as T
 
@@ -174,7 +175,7 @@
 -> IO settings
 loadYamlSettings runTimeFiles compileValues envUsage = do
 runValues <- forM runTimeFiles $ \fp -> do
-eres <- Y.decodeFileEither fp
+eres <- YI.decodeFileEither fp
 case eres of
 Left e -> do
 putStrLn $ "loadYamlSettings: Could not parse file as YAML: " 
++ fp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.17.2/yaml.cabal new/yaml-0.8.18/yaml.cabal
--- old/yaml-0.8.17.2/yaml.cabal2016-06-09 20:40:20.0 +0200
+++ new/yaml-0.8.18/yaml.cabal  2016-06-21 18:52:49.0 +0200
@@ -1,5 +1,5 @@
 name:yaml
-version: 0.8.17.2
+version: 0.8.18
 license: BSD3
 license-file:LICENSE
 author:  Michael Snoyman , Anton Ageev 
,Kirill Simonov

commit ghc-yaml for openSUSE:Factory

2016-06-14 Thread h_root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2016-06-14 23:08:32

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new (New)


Package is "ghc-yaml"

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2016-05-03 
09:36:43.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new/ghc-yaml.changes   2016-06-14 
23:08:33.0 +0200
@@ -1,0 +2,6 @@
+Fri Jun 10 06:57:00 UTC 2016 - mimi...@gmail.com
+
+- update to 0.8.17.2
+* Fix pretty-printing order of UnexpectedEvent's fields
+
+---

Old:

  yaml-0.8.17.1.tar.gz

New:

  yaml-0.8.17.2.tar.gz



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.0cgMoH/_old  2016-06-14 23:08:34.0 +0200
+++ /var/tmp/diff_new_pack.0cgMoH/_new  2016-06-14 23:08:34.0 +0200
@@ -18,7 +18,7 @@
 
 %global pkg_name yaml
 Name:   ghc-yaml
-Version:0.8.17.1
+Version:0.8.17.2
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause

++ yaml-0.8.17.1.tar.gz -> yaml-0.8.17.2.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.17.1/ChangeLog.md 
new/yaml-0.8.17.2/ChangeLog.md
--- old/yaml-0.8.17.1/ChangeLog.md  2016-04-14 17:22:07.0 +0200
+++ new/yaml-0.8.17.2/ChangeLog.md  2016-06-09 20:40:20.0 +0200
@@ -1,3 +1,7 @@
+## 0.8.17.2
+
+* Fix pretty-printing order of UnexpectedEvent's fields (fixes 
[#84](https://github.com/snoyberg/yaml/issues/84)) 
[#85](https://github.com/snoyberg/yaml/pull/85)
+
 ## 0.8.17.1
 
 * Avoid bug in Cabal [#83](https://github.com/snoyberg/yaml/pull/83)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.17.1/Data/Yaml/Internal.hs 
new/yaml-0.8.17.2/Data/Yaml/Internal.hs
--- old/yaml-0.8.17.1/Data/Yaml/Internal.hs 2016-04-14 17:22:07.0 
+0200
+++ new/yaml-0.8.17.2/Data/Yaml/Internal.hs 2016-06-09 20:40:20.0 
+0200
@@ -78,7 +78,7 @@
 prettyPrintParseException pe = case pe of
   NonScalarKey -> "Non scalar key"
   UnknownAlias anchor -> "Unknown alias `" ++ anchor ++ "`"
-  UnexpectedEvent mbExpected mbUnexpected -> unlines
+  UnexpectedEvent { _expected = mbExpected, _received = mbUnexpected } -> 
unlines
 [ "Unexpected event: expected"
 , "  " ++ show mbExpected
 , "but received"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.17.1/yaml.cabal new/yaml-0.8.17.2/yaml.cabal
--- old/yaml-0.8.17.1/yaml.cabal2016-04-14 17:22:07.0 +0200
+++ new/yaml-0.8.17.2/yaml.cabal2016-06-09 20:40:20.0 +0200
@@ -1,5 +1,5 @@
 name:yaml
-version: 0.8.17.1
+version: 0.8.17.2
 license: BSD3
 license-file:LICENSE
 author:  Michael Snoyman , Anton Ageev 
,Kirill Simonov

commit ghc-yaml for openSUSE:Factory

2016-05-03 Thread h_root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2016-05-03 09:36:41

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new (New)


Package is "ghc-yaml"

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2016-02-23 
16:59:36.0 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new/ghc-yaml.changes   2016-05-03 
09:36:43.0 +0200
@@ -1,0 +2,12 @@
+Sat Apr 16 07:43:00 UTC 2016 - mimi...@gmail.com
+
+- update to 0.8.17.1
+* workaround for Cabal bug
+
+---
+Tue Apr 12 10:26:04 UTC 2016 - mimi...@gmail.com
+
+- update to 0.8.17
+* loadYamlSettingsArgs
+
+---

Old:

  yaml-0.8.16.tar.gz

New:

  yaml-0.8.17.1.tar.gz



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.yH3Euq/_old  2016-05-03 09:36:44.0 +0200
+++ /var/tmp/diff_new_pack.yH3Euq/_new  2016-05-03 09:36:44.0 +0200
@@ -18,7 +18,7 @@
 
 %global pkg_name yaml
 Name:   ghc-yaml
-Version:0.8.16
+Version:0.8.17.1
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause
@@ -35,6 +35,7 @@
 BuildRequires:  ghc-conduit-devel
 BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-enclosed-exceptions-devel
+BuildRequires:  ghc-raw-strings-qq-devel
 BuildRequires:  ghc-resourcet-devel
 BuildRequires:  ghc-rpm-macros
 BuildRequires:  ghc-scientific-devel

++ yaml-0.8.16.tar.gz -> yaml-0.8.17.1.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.16/ChangeLog.md 
new/yaml-0.8.17.1/ChangeLog.md
--- old/yaml-0.8.16/ChangeLog.md2016-02-15 10:17:58.0 +0100
+++ new/yaml-0.8.17.1/ChangeLog.md  2016-04-14 17:22:07.0 +0200
@@ -1,3 +1,15 @@
+## 0.8.17.1
+
+* Avoid bug in Cabal [#83](https://github.com/snoyberg/yaml/pull/83)
+
+## 0.8.17
+
+* `loadYamlSettingsArgs`
+
+## 0.8.16.1
+
+* Slight doc improvement
+
 ## 0.8.16
 
 Add env variable parsing. `loadYamlSettings` can read config values from the 
environment with Yaml that specifies an env var.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.16/Data/Yaml/Config.hs 
new/yaml-0.8.17.1/Data/Yaml/Config.hs
--- old/yaml-0.8.16/Data/Yaml/Config.hs 2016-02-15 10:17:58.0 +0100
+++ new/yaml-0.8.17.1/Data/Yaml/Config.hs   2016-04-14 17:22:07.0 
+0200
@@ -9,16 +9,20 @@
 --
 -- On a historical note, this code was taken directly from the yesod web 
framework's configuration module.
 module Data.Yaml.Config
-( applyCurrentEnv
-, getCurrentEnv
-, applyEnvValue
-, loadYamlSettings
+( -- * High-level
+  loadYamlSettings
+, loadYamlSettingsArgs
+  -- ** EnvUsage
 , EnvUsage
 , ignoreEnv
 , useEnv
 , requireEnv
 , useCustomEnv
 , requireCustomEnv
+  -- * Lower level
+, applyCurrentEnv
+, getCurrentEnv
+, applyEnvValue
 ) where
 
 
@@ -31,7 +35,7 @@
 import Data.Aeson
 import qualified Data.HashMap.Strict as H
 import Data.Text (Text, pack)
-import System.Environment (getEnvironment)
+import System.Environment (getArgs, getEnvironment)
 import Control.Arrow ((***))
 import Control.Monad (forM)
 import Control.Exception (throwIO)
@@ -50,6 +54,14 @@
 mergeValues (Object x) (Object y) = Object $ H.unionWith mergeValues x y
 mergeValues x _ = x
 
+-- | Override environment variable placeholders in the given @Value@ with
+-- values from the environment.
+--
+-- If the first argument is @True@, then all placeholders _must_ be provided by
+-- the actual environment. Otherwise, default values from the @Value@ will be
+-- used.
+--
+-- @since 0.8.16
 applyEnvValue :: Bool -- ^ require an environment variable to be present?
   -> H.HashMap Text Text -> Value -> Value
 applyEnvValue requireEnv' env =
@@ -82,26 +94,62 @@
 
 parseValue val = fromMaybe (String val) $ Y.decode $ encodeUtf8 val
 
+-- | Get the actual environment as a @HashMap@ from @Text@ to @Text@.
+--
+-- @since 0.8.16
 getCurrentEnv :: IO (H.HashMap Text Text)
 getCurrentEnv = fmap (H.fromList . map (pack *** pack)) getEnvironment
 
+-- | A convenience wrapper around 'applyEnvValue' and 'getCurrentEnv'
+--
+-- @since 0.8.16
 applyCurrentEnv :: Bool -- ^ require an environment variable to be present?
 -> Value -> IO Value
 applyCurrentEnv requireEnv' orig = flip (applyEnvValue requireEnv') orig <$> 
getCurrentEnv
 
+-- | Defines how we want to use the environment variables when

commit ghc-yaml for openSUSE:Factory

2016-02-23 Thread h_root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2016-02-23 16:57:47

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new (New)


Package is "ghc-yaml"

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2016-01-28 
17:25:04.0 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new/ghc-yaml.changes   2016-02-23 
16:59:36.0 +0100
@@ -1,0 +2,8 @@
+Tue Feb 16 20:01:56 UTC 2016 - mimi...@gmail.com
+
+- update to 0.8.16
+* Add env variable parsing. loadYamlSettings can read config values from the 
+environment with Yaml that specifies an env var. The syntax is
+var: _env:ENV_VAR:default
+
+---

Old:

  yaml-0.8.15.3.tar.gz

New:

  yaml-0.8.16.tar.gz



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.RY0k9z/_old  2016-02-23 16:59:37.0 +0100
+++ /var/tmp/diff_new_pack.RY0k9z/_new  2016-02-23 16:59:37.0 +0100
@@ -18,7 +18,7 @@
 
 %global pkg_name yaml
 Name:   ghc-yaml
-Version:0.8.15.3
+Version:0.8.16
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause
@@ -38,6 +38,7 @@
 BuildRequires:  ghc-resourcet-devel
 BuildRequires:  ghc-rpm-macros
 BuildRequires:  ghc-scientific-devel
+BuildRequires:  ghc-semigroups-devel
 BuildRequires:  ghc-text-devel
 BuildRequires:  ghc-transformers-devel
 BuildRequires:  ghc-unordered-containers-devel

++ yaml-0.8.15.3.tar.gz -> yaml-0.8.16.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.15.3/ChangeLog.md 
new/yaml-0.8.16/ChangeLog.md
--- old/yaml-0.8.15.3/ChangeLog.md  2016-01-18 15:53:27.0 +0100
+++ new/yaml-0.8.16/ChangeLog.md2016-02-15 10:17:58.0 +0100
@@ -1,3 +1,10 @@
+## 0.8.16
+
+Add env variable parsing. `loadYamlSettings` can read config values from the 
environment with Yaml that specifies an env var.
+The syntax is
+
+`var: _env:ENV_VAR:default`
+
 ## 0.8.15.3
 
 * Give a warning when compiling with GHCJS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.15.3/Data/Yaml/Config.hs 
new/yaml-0.8.16/Data/Yaml/Config.hs
--- old/yaml-0.8.15.3/Data/Yaml/Config.hs   1970-01-01 01:00:00.0 
+0100
+++ new/yaml-0.8.16/Data/Yaml/Config.hs 2016-02-15 10:17:58.0 +0100
@@ -0,0 +1,143 @@
+{-# LANGUAGE CPP #-}
+{-# LANGUAGE OverloadedStrings #-}
+-- | Functionality for using YAML as configuration files
+--
+-- In particular, merging environment variables with yaml values
+--
+-- 'loadYamlSettings' is a high-level API for loading YAML and merging 
environment variables.
+-- A yaml value of @_env:ENV_VAR:default@ will lookup the environment variable 
@ENV_VAR@.
+--
+-- On a historical note, this code was taken directly from the yesod web 
framework's configuration module.
+module Data.Yaml.Config
+( applyCurrentEnv
+, getCurrentEnv
+, applyEnvValue
+, loadYamlSettings
+, EnvUsage
+, ignoreEnv
+, useEnv
+, requireEnv
+, useCustomEnv
+, requireCustomEnv
+) where
+
+
+#if __GLASGOW_HASKELL__ < 710
+import Control.Applicative ((<$>))
+import Data.Monoid
+#endif
+import Data.Semigroup
+import Data.List.NonEmpty (nonEmpty)
+import Data.Aeson
+import qualified Data.HashMap.Strict as H
+import Data.Text (Text, pack)
+import System.Environment (getEnvironment)
+import Control.Arrow ((***))
+import Control.Monad (forM)
+import Control.Exception (throwIO)
+import Data.Text.Encoding (encodeUtf8)
+import qualified Data.Yaml as Y
+import Data.Maybe (fromMaybe)
+import qualified Data.Text as T
+
+newtype MergedValue = MergedValue { getMergedValue :: Value }
+
+instance Semigroup MergedValue where
+MergedValue x <> MergedValue y = MergedValue $ mergeValues x y
+
+-- | Left biased
+mergeValues :: Value -> Value -> Value
+mergeValues (Object x) (Object y) = Object $ H.unionWith mergeValues x y
+mergeValues x _ = x
+
+applyEnvValue :: Bool -- ^ require an environment variable to be present?
+  -> H.HashMap Text Text -> Value -> Value
+applyEnvValue requireEnv' env =
+goV
+  where
+goV (Object o) = Object $ goV <$> o
+goV (Array a) = Array (goV <$> a)
+goV (String t1) = fromMaybe (String t1) $ do
+t2 <- T.stripPrefix "_env:" t1
+let (name, t3) = T.break (== ':') t2
+mdef = fmap parseValue $ T.stripPrefix ":" t3
+Just $ case H.lookup name env of
+Just val ->
+-- If the default value parses as a String, we treat the
+

commit ghc-yaml for openSUSE:Factory

2016-01-29 Thread h_root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2016-01-28 17:24:12

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new (New)


Package is "ghc-yaml"

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2015-12-09 
22:17:35.0 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new/ghc-yaml.changes   2016-01-28 
17:25:04.0 +0100
@@ -1,0 +2,6 @@
+Wed Jan 20 13:48:32 UTC 2016 - mimi...@gmail.com
+
+- update to 0.8.15.3
+* Give a warning when compiling with GHCJS
+
+---

Old:

  yaml-0.8.15.2.tar.gz

New:

  yaml-0.8.15.3.tar.gz



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.ZQQJNm/_old  2016-01-28 17:25:05.0 +0100
+++ /var/tmp/diff_new_pack.ZQQJNm/_new  2016-01-28 17:25:05.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package ghc-yaml
 #
-# 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
@@ -18,7 +18,7 @@
 
 %global pkg_name yaml
 Name:   ghc-yaml
-Version:0.8.15.2
+Version:0.8.15.3
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause
@@ -69,7 +69,6 @@
 %setup -q -n %{pkg_name}-%{version}
 
 %build
-
 %define cabal_configure_options -f system-libyaml
 %ghc_lib_build
 

++ yaml-0.8.15.2.tar.gz -> yaml-0.8.15.3.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.15.2/ChangeLog.md 
new/yaml-0.8.15.3/ChangeLog.md
--- old/yaml-0.8.15.2/ChangeLog.md  2015-11-29 17:03:39.0 +0100
+++ new/yaml-0.8.15.3/ChangeLog.md  2016-01-18 15:53:27.0 +0100
@@ -1,3 +1,7 @@
+## 0.8.15.3
+
+* Give a warning when compiling with GHCJS
+
 ## 0.8.15.2
 
 * Canonicalise Monad instances [#76](https://github.com/snoyberg/yaml/pull/76)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.15.2/Data/Yaml.hs 
new/yaml-0.8.15.3/Data/Yaml.hs
--- old/yaml-0.8.15.2/Data/Yaml.hs  2015-11-29 17:03:39.0 +0100
+++ new/yaml-0.8.15.3/Data/Yaml.hs  2016-01-18 15:53:27.0 +0100
@@ -16,7 +16,11 @@
 --
 -- For documentation on the @aeson@ types, functions, classes, and
 -- operators, please see the @Data.Aeson@ module of the @aeson@ package.
+#if (defined (ghcjs_HOST_OS))
+module Data.Yaml {-# WARNING "GHCJS is not supported yet (will break at 
runtime once called)." #-}
+#else
 module Data.Yaml
+#endif
 ( -- * Types
   Value (..)
 , Parser
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.15.2/yaml.cabal new/yaml-0.8.15.3/yaml.cabal
--- old/yaml-0.8.15.2/yaml.cabal2015-11-29 17:03:39.0 +0100
+++ new/yaml-0.8.15.3/yaml.cabal2016-01-18 15:53:27.0 +0100
@@ -1,5 +1,5 @@
 name:yaml
-version: 0.8.15.2
+version: 0.8.15.3
 license: BSD3
 license-file:LICENSE
 author:  Michael Snoyman , Anton Ageev 
,Kirill Simonov

commit ghc-yaml for openSUSE:Factory

2015-12-09 Thread h_root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2015-12-09 19:53:25

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new (New)


Package is "ghc-yaml"

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2015-09-17 
09:19:54.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new/ghc-yaml.changes   2015-12-09 
22:17:35.0 +0100
@@ -1,0 +2,6 @@
+Mon Dec  7 12:15:09 UTC 2015 - mimi...@gmail.com
+
+- update to 0.8.15.2
+* Canonicalise Monad instances
+
+---

Old:

  yaml-0.8.15.1.tar.gz

New:

  yaml-0.8.15.2.tar.gz



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.MvGiTW/_old  2015-12-09 22:17:35.0 +0100
+++ /var/tmp/diff_new_pack.MvGiTW/_new  2015-12-09 22:17:35.0 +0100
@@ -18,7 +18,7 @@
 
 %global pkg_name yaml
 Name:   ghc-yaml
-Version:0.8.15.1
+Version:0.8.15.2
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause

++ yaml-0.8.15.1.tar.gz -> yaml-0.8.15.2.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.15.1/ChangeLog.md 
new/yaml-0.8.15.2/ChangeLog.md
--- old/yaml-0.8.15.1/ChangeLog.md  2015-09-06 10:27:33.0 +0200
+++ new/yaml-0.8.15.2/ChangeLog.md  2015-11-29 17:03:39.0 +0100
@@ -1,3 +1,7 @@
+## 0.8.15.2
+
+* Canonicalise Monad instances [#76](https://github.com/snoyberg/yaml/pull/76)
+
 ## 0.8.15.1
 
 * Compile with aeson below 0.7 [#70](https://github.com/snoyberg/yaml/pull/70)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.15.1/Data/Yaml/Builder.hs 
new/yaml-0.8.15.2/Data/Yaml/Builder.hs
--- old/yaml-0.8.15.1/Data/Yaml/Builder.hs  2015-09-06 10:27:33.0 
+0200
+++ new/yaml-0.8.15.2/Data/Yaml/Builder.hs  2015-11-29 17:03:39.0 
+0100
@@ -18,30 +18,26 @@
 , (.=)
 ) where
 
-import Data.Conduit
-import Data.ByteString (ByteString)
-import Text.Libyaml
-import Data.Yaml.Internal
-import Data.Text (Text)
-#if MIN_VERSION_aeson(0, 7, 0)
-import Data.Scientific (Scientific)
+import Prelude hiding (null)
+
+import Control.Arrow (second)
+import Control.Monad.Trans.Resource (runResourceT)
+import Data.Aeson.Encode (encodeToTextBuilder)
 import Data.Aeson.Types (Value(..))
-#endif
+import Data.ByteString (ByteString)
+import qualified Data.ByteString.Char8 as S8
+import Data.Conduit
 import qualified Data.HashSet as HashSet
+import Data.Scientific (Scientific)
+import Data.Text (Text)
 import Data.Text.Encoding (encodeUtf8)
-import System.IO.Unsafe (unsafePerformIO)
-import Control.Arrow (second)
-import qualified Data.ByteString.Char8 as S8
-import Control.Monad.Trans.Resource (runResourceT)
-#if MIN_VERSION_aeson(0, 7, 0)
 import qualified Data.Text.Encoding as TE
 import qualified Data.Text.Lazy as TL
 import Data.Text.Lazy.Builder (toLazyText)
-import Data.Aeson.Encode (encodeToTextBuilder)
-#else
-import Data.Attoparsec.Number
-#endif
-import Prelude hiding (null)
+import System.IO.Unsafe (unsafePerformIO)
+
+import Data.Yaml.Internal
+import Text.Libyaml
 
 (.=) :: ToYaml a => Text -> a -> (Text, YamlBuilder)
 k .= v = (k, toYaml v)
@@ -73,7 +69,7 @@
 array bs =
 YamlBuilder $ (EventSequenceStart Nothing:) . flip (foldr go) bs . 
(EventSequenceEnd:)
   where
-go (YamlBuilder b) rest = b rest
+go (YamlBuilder b) = b
 
 string :: Text -> YamlBuilder
 -- Empty strings need special handling to ensure they get quoted. This avoids:
@@ -89,22 +85,12 @@
 | otherwise = EventScalar (encodeUtf8 s) StrTag PlainNoTag Nothing
  
 -- Use aeson's implementation which gets rid of annoying decimal points
-#if MIN_VERSION_aeson(0, 7, 0)
 scientific :: Scientific -> YamlBuilder
 scientific n = YamlBuilder (EventScalar (TE.encodeUtf8 $ TL.toStrict $ 
toLazyText $ encodeToTextBuilder (Number n)) IntTag PlainNoTag Nothing :)
-#else
-scientific :: Number -> YamlBuilder
-scientific n = YamlBuilder (EventScalar (S8.pack $ show n) IntTag PlainNoTag 
Nothing :)
-#endif
 
 {-# DEPRECATED number "Use scientific" #-}
-#if MIN_VERSION_aeson(0,7,0)
 number :: Scientific -> YamlBuilder
 number = scientific
-#else
-number :: Number -> YamlBuilder
-number n = YamlBuilder (EventScalar (S8.pack $ show n) IntTag PlainNoTag 
Nothing :)
-#endif
 
 bool :: Bool -> YamlBuilder
 bool True   = YamlBuilder (EventScalar "true" BoolTag PlainNoTag Nothing :)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore'

commit ghc-yaml for openSUSE:Factory

2015-09-17 Thread h_root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2015-09-17 09:19:53

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new (New)


Package is "ghc-yaml"

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2015-09-02 
00:36:16.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new/ghc-yaml.changes   2015-09-17 
09:19:54.0 +0200
@@ -1,0 +2,6 @@
+Sun Sep 13 13:22:11 UTC 2015 - mimi...@gmail.com
+
+- update to 0.8.15.1
+* Parse Scientific directly, avoiding loss in precision.
+
+---

Old:

  yaml-0.8.14.tar.gz

New:

  yaml-0.8.15.1.tar.gz



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.ORigb7/_old  2015-09-17 09:19:54.0 +0200
+++ /var/tmp/diff_new_pack.ORigb7/_new  2015-09-17 09:19:54.0 +0200
@@ -18,7 +18,7 @@
 
 %global pkg_name yaml
 Name:   ghc-yaml
-Version:0.8.14
+Version:0.8.15.1
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause

++ yaml-0.8.14.tar.gz -> yaml-0.8.15.1.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.14/ChangeLog.md 
new/yaml-0.8.15.1/ChangeLog.md
--- old/yaml-0.8.14/ChangeLog.md2015-08-30 08:11:27.0 +0200
+++ new/yaml-0.8.15.1/ChangeLog.md  2015-09-06 10:27:33.0 +0200
@@ -1,3 +1,11 @@
+## 0.8.15.1
+
+* Compile with aeson below 0.7 [#70](https://github.com/snoyberg/yaml/pull/70)
+
+## 0.8.15
+
+* Parse `Scientific` directly, avoiding loss in precision. 
[#68](https://github.com/snoyberg/yaml/pull/68)
+
 ## 0.8.14
 
 * Pretty print improvements for exceptions 
[#67](https://github.com/snoyberg/yaml/pull/67)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.14/Data/Yaml/Builder.hs 
new/yaml-0.8.15.1/Data/Yaml/Builder.hs
--- old/yaml-0.8.14/Data/Yaml/Builder.hs2015-08-30 08:11:27.0 
+0200
+++ new/yaml-0.8.15.1/Data/Yaml/Builder.hs  2015-09-06 10:27:33.0 
+0200
@@ -23,10 +23,11 @@
 import Text.Libyaml
 import Data.Yaml.Internal
 import Data.Text (Text)
+#if MIN_VERSION_aeson(0, 7, 0)
 import Data.Scientific (Scientific)
 import Data.Aeson.Types (Value(..))
+#endif
 import qualified Data.HashSet as HashSet
-import qualified Data.Text as T
 import Data.Text.Encoding (encodeUtf8)
 import System.IO.Unsafe (unsafePerformIO)
 import Control.Arrow (second)
@@ -38,7 +39,7 @@
 import Data.Text.Lazy.Builder (toLazyText)
 import Data.Aeson.Encode (encodeToTextBuilder)
 #else
-import qualified Data.ByteString.Char8 as S8
+import Data.Attoparsec.Number
 #endif
 import Prelude hiding (null)
 
@@ -88,8 +89,13 @@
 | otherwise = EventScalar (encodeUtf8 s) StrTag PlainNoTag Nothing
  
 -- Use aeson's implementation which gets rid of annoying decimal points
+#if MIN_VERSION_aeson(0, 7, 0)
 scientific :: Scientific -> YamlBuilder
 scientific n = YamlBuilder (EventScalar (TE.encodeUtf8 $ TL.toStrict $ 
toLazyText $ encodeToTextBuilder (Number n)) IntTag PlainNoTag Nothing :)
+#else
+scientific :: Number -> YamlBuilder
+scientific n = YamlBuilder (EventScalar (S8.pack $ show n) IntTag PlainNoTag 
Nothing :)
+#endif
 
 {-# DEPRECATED number "Use scientific" #-}
 #if MIN_VERSION_aeson(0,7,0)
@@ -97,7 +103,7 @@
 number = scientific
 #else
 number :: Number -> YamlBuilder
-number n rest = YamlBuilder (EventScalar (S8.pack $ show n) IntTag PlainNoTag 
Nothing :)
+number n = YamlBuilder (EventScalar (S8.pack $ show n) IntTag PlainNoTag 
Nothing :)
 #endif
 
 bool :: Bool -> YamlBuilder
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.14/Data/Yaml/Internal.hs 
new/yaml-0.8.15.1/Data/Yaml/Internal.hs
--- old/yaml-0.8.14/Data/Yaml/Internal.hs   2015-08-30 08:11:27.0 
+0200
+++ new/yaml-0.8.15.1/Data/Yaml/Internal.hs 2015-09-06 10:27:33.0 
+0200
@@ -19,7 +19,6 @@
 import Text.Libyaml hiding (encode, decode, encodeFile, decodeFile)
 import Data.ByteString (ByteString)
 import qualified Data.Map as Map
-import Data.Maybe (isNothing)
 import Control.Exception
 import Control.Exception.Enclosed
 import Control.Monad.Trans.State
@@ -37,10 +36,11 @@
 import Data.Text.Encoding.Error (lenientDecode)
 import qualified Data.HashMap.Strict as M
 import Data.Typeable
-import Data.Text.Read
 #if MIN_VERSION_aeson(0, 7, 0)
-import Data.Scientific (fromFloatDigits)
+import qualified Data.Attoparsec.Text as Atto
+import Data.Scientific (Scientific)
 #else
+import Data.Text.Read
 import

commit ghc-yaml for openSUSE:Factory

2015-09-01 Thread h_root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2015-09-02 00:36:14

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new (New)


Package is "ghc-yaml"

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2015-08-27 
08:55:36.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new/ghc-yaml.changes   2015-09-02 
00:36:16.0 +0200
@@ -1,0 +2,6 @@
+Mon Aug 31 08:46:59 UTC 2015 - mimi...@gmail.com
+
+- update to 0.8.14
+* Pretty print improvements for exceptions
+
+---

Old:

  yaml-0.8.13.tar.gz

New:

  yaml-0.8.14.tar.gz



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.vv6JmB/_old  2015-09-02 00:36:17.0 +0200
+++ /var/tmp/diff_new_pack.vv6JmB/_new  2015-09-02 00:36:17.0 +0200
@@ -18,7 +18,7 @@
 
 %global pkg_name yaml
 Name:   ghc-yaml
-Version:0.8.13
+Version:0.8.14
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause

++ yaml-0.8.13.tar.gz -> yaml-0.8.14.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.13/ChangeLog.md new/yaml-0.8.14/ChangeLog.md
--- old/yaml-0.8.13/ChangeLog.md2015-08-13 12:42:36.0 +0200
+++ new/yaml-0.8.14/ChangeLog.md2015-08-30 08:11:27.0 +0200
@@ -1,3 +1,7 @@
+## 0.8.14
+
+* Pretty print improvements for exceptions 
[#67](https://github.com/snoyberg/yaml/pull/67)
+
 ## 0.8.13
 
 * Pretty module [#66](https://github.com/snoyberg/yaml/pull/66)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.13/Data/Yaml/Internal.hs 
new/yaml-0.8.14/Data/Yaml/Internal.hs
--- old/yaml-0.8.13/Data/Yaml/Internal.hs   2015-08-13 12:42:36.0 
+0200
+++ new/yaml-0.8.14/Data/Yaml/Internal.hs   2015-08-30 08:11:27.0 
+0200
@@ -19,6 +19,7 @@
 import Text.Libyaml hiding (encode, decode, encodeFile, decodeFile)
 import Data.ByteString (ByteString)
 import qualified Data.Map as Map
+import Data.Maybe (isNothing)
 import Control.Exception
 import Control.Exception.Enclosed
 import Control.Monad.Trans.State
@@ -66,36 +67,44 @@
 --   Instead of displaying the data constructors applied to their arguments,
 --   a more textual output is returned. For example, instead of printing:
 --
--- > AesonException "The key \"foo\" was not found"
+-- > InvalidYaml (Just (YamlParseException {yamlProblem = "did not find 
expected ',' or '}'", yamlContext = "while parsing a flow mapping", 
yamlProblemMark = YamlMark {yamlIndex = 42, yamlLine = 2, yamlColumn = 12}})))
 --
 --   It looks more pleasant to print:
 --
--- > Aeson exception: The key "foo" was not found
+-- > YAML parse exception at line 2, column 12,
+-- > while parsing a flow mapping:
+-- > did not find expected ',' or '}'
 --
 -- Since 0.8.11
 prettyPrintParseException :: ParseException -> String
-prettyPrintParseException NonScalarKey = "Non scalar key"
-prettyPrintParseException (UnknownAlias n) =
-  "Unknown alias: " ++ n
-prettyPrintParseException (UnexpectedEvent r e) = unlines
-  [ "Unexpected event:"
-  , "  Received: " ++ maybe "None" show r
-  , "  Expected: " ++ maybe "None" show e
+prettyPrintParseException pe = case pe of
+  NonScalarKey -> "Non scalar key"
+  UnknownAlias anchor -> "Unknown alias `" ++ anchor ++ "`"
+  UnexpectedEvent mbExpected mbUnexpected -> unlines
+[ "Unexpected event: expected"
+, "  " ++ show mbExpected
+, "but received"
+, "  " ++ show mbUnexpected
 ]
-prettyPrintParseException (InvalidYaml mye) =
-  case mye of
-Just ye -> "Invalid yaml: " ++ show ye
-_ -> "Invalid yaml"
-prettyPrintParseException (AesonException e) =
-  "Aeson exception: " ++ e
-prettyPrintParseException (OtherParseException e) =
-  "Parse exception: " ++ show e
-prettyPrintParseException (NonStringKeyAlias n v) = unlines
-  [ "Non-string key alias:"
-  , "  Anchor name: " ++ n
-  , "  Value: " ++ show v 
+  InvalidYaml mbYamlError -> case mbYamlError of
+Nothing -> "Unspecified YAML error"
+Just yamlError -> case yamlError of
+  YamlException s -> "YAML exception:\n" ++ s
+  YamlParseException problem context mark -> unlines
+[ "YAML parse exception at line " ++ show (yamlLine mark) ++
+  ", column " ++ show (yamlColumn mark) ++ ","
+-- The context seems to include a leading "while" or similar.
+, context ++ ":"
+, problem
+]
+  AesonException s -> "Aeson exception:\n" ++ s
+  OtherParseException exc -> "Generic parse

commit ghc-yaml for openSUSE:Factory

2015-08-27 Thread h_root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2015-08-27 08:55:35

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new (New)


Package is ghc-yaml

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2015-08-05 
06:50:55.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new/ghc-yaml.changes   2015-08-27 
08:55:36.0 +0200
@@ -1,0 +2,6 @@
+Sun Aug 16 17:53:49 UTC 2015 - mimi...@gmail.com
+
+- update 0.8.13
+* Pretty module
+
+---

Old:

  yaml-0.8.12.tar.gz

New:

  yaml-0.8.13.tar.gz



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.uJFEXp/_old  2015-08-27 08:55:37.0 +0200
+++ /var/tmp/diff_new_pack.uJFEXp/_new  2015-08-27 08:55:37.0 +0200
@@ -18,7 +18,7 @@
 
 %global pkg_name yaml
 Name:   ghc-yaml
-Version:0.8.12
+Version:0.8.13
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause

++ yaml-0.8.12.tar.gz - yaml-0.8.13.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.12/ChangeLog.md new/yaml-0.8.13/ChangeLog.md
--- old/yaml-0.8.12/ChangeLog.md2015-07-20 15:49:55.0 +0200
+++ new/yaml-0.8.13/ChangeLog.md2015-08-13 12:42:36.0 +0200
@@ -1,3 +1,7 @@
+## 0.8.13
+
+* Pretty module [#66](https://github.com/snoyberg/yaml/pull/66)
+
 ## 0.8.12
 
 * Proper handling of `String +123` 
[#64](https://github.com/snoyberg/yaml/issues/64)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.12/Data/Yaml/Builder.hs 
new/yaml-0.8.13/Data/Yaml/Builder.hs
--- old/yaml-0.8.12/Data/Yaml/Builder.hs2015-07-20 15:49:55.0 
+0200
+++ new/yaml-0.8.13/Data/Yaml/Builder.hs2015-08-13 12:42:36.0 
+0200
@@ -1,4 +1,6 @@
 {-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE CPP #-}
 -- | NOTE: This module is a highly experimental preview release. It may change
 -- drastically, or be entirely removed, in a future release.
 module Data.Yaml.Builder
@@ -7,6 +9,10 @@
 , mapping
 , array
 , string
+, bool
+, null
+, scientific
+, number
 , toByteString
 , writeYamlFile
 , (.=)
@@ -15,12 +21,26 @@
 import Data.Conduit
 import Data.ByteString (ByteString)
 import Text.Libyaml
+import Data.Yaml.Internal
 import Data.Text (Text)
+import Data.Scientific (Scientific)
+import Data.Aeson.Types (Value(..))
+import qualified Data.HashSet as HashSet
+import qualified Data.Text as T
 import Data.Text.Encoding (encodeUtf8)
 import System.IO.Unsafe (unsafePerformIO)
 import Control.Arrow (second)
 import qualified Data.ByteString.Char8 as S8
 import Control.Monad.Trans.Resource (runResourceT)
+#if MIN_VERSION_aeson(0, 7, 0)
+import qualified Data.Text.Encoding as TE
+import qualified Data.Text.Lazy as TL
+import Data.Text.Lazy.Builder (toLazyText)
+import Data.Aeson.Encode (encodeToTextBuilder)
+#else
+import qualified Data.ByteString.Char8 as S8
+#endif
+import Prelude hiding (null)
 
 (.=) :: ToYaml a = Text - a - (Text, YamlBuilder)
 k .= v = (k, toYaml v)
@@ -55,7 +75,37 @@
 go (YamlBuilder b) rest = b rest
 
 string :: Text - YamlBuilder
-string t = YamlBuilder (EventScalar (encodeUtf8 t) StrTag PlainNoTag Nothing:)
+-- Empty strings need special handling to ensure they get quoted. This avoids:
+-- https://github.com/snoyberg/yaml/issues/24
+string   = YamlBuilder (EventScalar  NoTag SingleQuoted Nothing :)
+string s   =
+YamlBuilder (event :)
+  where
+event
+-- Make sure that special strings are encoded as strings properly.
+-- See: https://github.com/snoyberg/yaml/issues/31
+| s `HashSet.member` specialStrings || isNumeric s = EventScalar 
(encodeUtf8 s) NoTag SingleQuoted Nothing
+| otherwise = EventScalar (encodeUtf8 s) StrTag PlainNoTag Nothing
+ 
+-- Use aeson's implementation which gets rid of annoying decimal points
+scientific :: Scientific - YamlBuilder
+scientific n = YamlBuilder (EventScalar (TE.encodeUtf8 $ TL.toStrict $ 
toLazyText $ encodeToTextBuilder (Number n)) IntTag PlainNoTag Nothing :)
+
+{-# DEPRECATED number Use scientific #-}
+#if MIN_VERSION_aeson(0,7,0)
+number :: Scientific - YamlBuilder
+number = scientific
+#else
+number :: Number - YamlBuilder
+number n rest = YamlBuilder (EventScalar (S8.pack $ show n) IntTag PlainNoTag 
Nothing :)
+#endif
+
+bool :: Bool - YamlBuilder
+bool True   = YamlBuilder (EventScalar true BoolTag PlainNoTag Nothing :)

commit ghc-yaml for openSUSE:Factory

2015-08-04 Thread h_root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2015-08-05 06:50:54

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new (New)


Package is ghc-yaml

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2015-05-21 
08:33:36.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new/ghc-yaml.changes   2015-08-05 
06:50:55.0 +0200
@@ -1,0 +2,6 @@
+Mon Jul 27 07:52:19 UTC 2015 - mimi...@gmail.com
+
+- update to 0.8.12
+* Proper handling of String +123
+
+---

Old:

  yaml-0.8.11.tar.gz

New:

  yaml-0.8.12.tar.gz



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.0aWOVG/_old  2015-08-05 06:50:55.0 +0200
+++ /var/tmp/diff_new_pack.0aWOVG/_new  2015-08-05 06:50:55.0 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package ghc
+# spec file for package ghc-yaml
 #
 # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
@@ -17,8 +17,8 @@
 
 
 %global pkg_name yaml
-Name:   ghc-%{pkg_name}
-Version:0.8.11
+Name:   ghc-yaml
+Version:0.8.12
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause

++ yaml-0.8.11.tar.gz - yaml-0.8.12.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.11/ChangeLog.md new/yaml-0.8.12/ChangeLog.md
--- old/yaml-0.8.11/ChangeLog.md2015-04-19 08:52:46.0 +0200
+++ new/yaml-0.8.12/ChangeLog.md2015-07-20 15:49:55.0 +0200
@@ -1,3 +1,7 @@
+## 0.8.12
+
+* Proper handling of `String +123` 
[#64](https://github.com/snoyberg/yaml/issues/64)
+
 ## 0.8.11
 
 * Function to print prettier parse exceptions 
[#59](https://github.com/snoyberg/yaml/pull/59)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.11/Data/Yaml.hs new/yaml-0.8.12/Data/Yaml.hs
--- old/yaml-0.8.11/Data/Yaml.hs2015-04-19 08:52:46.0 +0200
+++ new/yaml-0.8.12/Data/Yaml.hs2015-07-20 15:49:55.0 +0200
@@ -158,6 +158,7 @@
 || c == 'E'
 || c == '.'
 || c == '-'
+|| c == '+'
 
 decode :: FromJSON a
= ByteString
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.11/test/Data/Yaml/IncludeSpec.hs 
new/yaml-0.8.12/test/Data/Yaml/IncludeSpec.hs
--- old/yaml-0.8.11/test/Data/Yaml/IncludeSpec.hs   2015-04-19 
08:52:46.0 +0200
+++ new/yaml-0.8.12/test/Data/Yaml/IncludeSpec.hs   2015-07-20 
15:49:55.0 +0200
@@ -2,7 +2,7 @@
 module Data.Yaml.IncludeSpec (main, spec) where
 
 import   Test.Hspec
-import   Test.Hspec.Expectations.Contrib
+import   Data.Either.Compat
 import   Data.Aeson
 import   Data.Aeson.QQ
 import   Data.Yaml (ParseException)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.11/test/Data/YamlSpec.hs 
new/yaml-0.8.12/test/Data/YamlSpec.hs
--- old/yaml-0.8.11/test/Data/YamlSpec.hs   2015-04-19 08:52:46.0 
+0200
+++ new/yaml-0.8.12/test/Data/YamlSpec.hs   2015-07-20 15:49:55.0 
+0200
@@ -15,11 +15,11 @@
 import qualified Control.Monad.Trans.Resource as C
 import qualified Data.Conduit.List as CL
 
-import System.Directory
 import Control.Monad
 import Control.Exception (try, SomeException)
 import Test.Hspec
-import Test.Hspec.Expectations.Contrib
+import Data.Either.Compat
+import Test.Mockery.Directory
 
 import qualified Data.Yaml as D
 import Data.Yaml (object, array, (.=))
@@ -140,6 +140,9 @@
 
 it aliases in keys #49 caseIssue49
 
+it serialization of +123 #64 $ do
+D.decode (D.encode (+123 :: String)) `shouldBe` Just (+123 :: 
String)
+
 
 specialStrings :: [T.Text]
 specialStrings =
@@ -237,26 +240,17 @@
 yamlString = foo: bar\nbaz:\n - bin1\n - bin2\n
 yamlBS = B8.pack yamlString
 
-removeFile' :: FilePath - IO ()
-removeFile' fp = do
-x - doesFileExist fp
-when x $ removeFile fp
-
 caseEncodeDecodeFile :: Assertion
-caseEncodeDecodeFile = do
-removeFile' tmpPath
+caseEncodeDecodeFile = withFile  $ \tmpPath - do
 eList - C.runResourceT $ Y.decodeFile filePath C.$$ CL.consume
 C.runResourceT $ CL.sourceList eList C.$$ Y.encodeFile tmpPath
 eList2 - C.runResourceT $ Y.decodeFile filePath C.$$ CL.consume
 map MyEvent eList @=? map MyEvent eList2
   where
 filePath = test/largest-string.yaml
-tmpPath = tmp.yaml
 
 caseInterleave :: Assertion

commit ghc-yaml for openSUSE:Factory

2015-05-21 Thread h_root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2015-05-21 08:33:35

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new (New)


Package is ghc-yaml

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2015-03-03 
11:14:16.0 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new/ghc-yaml.changes   2015-05-21 
08:33:36.0 +0200
@@ -1,0 +2,11 @@
+Tue Apr 28 10:44:08 UTC 2015 - mimi...@gmail.com
+
+- change libyaml deps from pkgconfig to direct libyaml-devel for SLE12 support 
+
+---
+Mon Apr 27 08:33:55 UTC 2015 - mimi...@gmail.com
+
+- update to 0.8.11
+* Function to print prettier parse exceptions 
[#59](https://github.com/snoyberg/yaml/pull/59)
+
+---

Old:

  _service
  yaml-0.8.10.1.tar.gz

New:

  yaml-0.8.11.tar.gz



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.as1fFz/_old  2015-05-21 08:33:36.0 +0200
+++ /var/tmp/diff_new_pack.as1fFz/_new  2015-05-21 08:33:36.0 +0200
@@ -17,19 +17,17 @@
 
 
 %global pkg_name yaml
-
 Name:   ghc-%{pkg_name}
-Version:0.8.10.1
+Version:0.8.11
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause
 Group:  System/Libraries
 Url:http://hackage.haskell.org/package/%{pkg_name}
 Source0:
http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-
+# End cabal-rpm deps
+BuildRequires:  chrpath
 BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros
 # Begin cabal-rpm deps:
 BuildRequires:  ghc-aeson-devel
 BuildRequires:  ghc-attoparsec-devel
@@ -38,16 +36,14 @@
 BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-enclosed-exceptions-devel
 BuildRequires:  ghc-resourcet-devel
+BuildRequires:  ghc-rpm-macros
 BuildRequires:  ghc-scientific-devel
 BuildRequires:  ghc-text-devel
 BuildRequires:  ghc-transformers-devel
 BuildRequires:  ghc-unordered-containers-devel
 BuildRequires:  ghc-vector-devel
-# End cabal-rpm deps
-BuildRequires:  chrpath
 BuildRequires:  libyaml-devel
-BuildRequires:  pkg-config
-
+BuildRequires:  pkgconfig(pkg-config)
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -73,6 +69,7 @@
 %setup -q -n %{pkg_name}-%{version}
 
 %build
+
 %define cabal_configure_options -f system-libyaml
 %ghc_lib_build
 

++ yaml-0.8.10.1.tar.gz - yaml-0.8.11.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.10.1/ChangeLog.md 
new/yaml-0.8.11/ChangeLog.md
--- old/yaml-0.8.10.1/ChangeLog.md  2014-12-03 12:38:27.0 +0100
+++ new/yaml-0.8.11/ChangeLog.md2015-04-19 08:52:46.0 +0200
@@ -1,3 +1,7 @@
+## 0.8.11
+
+* Function to print prettier parse exceptions 
[#59](https://github.com/snoyberg/yaml/pull/59)
+
 ## 0.8.10
 
 Add the Data.Yaml.Include module
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yaml-0.8.10.1/Data/Yaml/Internal.hs 
new/yaml-0.8.11/Data/Yaml/Internal.hs
--- old/yaml-0.8.10.1/Data/Yaml/Internal.hs 2014-12-03 12:38:27.0 
+0100
+++ new/yaml-0.8.11/Data/Yaml/Internal.hs   2015-04-19 08:52:46.0 
+0200
@@ -5,6 +5,7 @@
 module Data.Yaml.Internal
 (
   ParseException(..)
+, prettyPrintParseException
 , parse
 , decodeHelper
 , decodeHelper_
@@ -52,7 +53,46 @@
 | NonStringKeyAlias Y.AnchorName Value
 | CyclicIncludes
 deriving (Show, Typeable)
-instance Exception ParseException
+
+instance Exception ParseException where
+#if MIN_VERSION_base(4, 8, 0)
+  displayException = prettyPrintParseException
+#endif
+
+-- | Alternative to 'show' to display a 'ParseException' on the screen.
+--   Instead of displaying the data constructors applied to their arguments,
+--   a more textual output is returned. For example, instead of printing:
+--
+--  AesonException The key \foo\ was not found
+--
+--   It looks more pleasant to print:
+--
+--  Aeson exception: The key foo was not found
+--
+-- Since 0.8.11
+prettyPrintParseException :: ParseException - String
+prettyPrintParseException NonScalarKey = Non scalar key
+prettyPrintParseException (UnknownAlias n) =
+  Unknown alias:  ++ n
+prettyPrintParseException (UnexpectedEvent r e) = unlines
+  [ Unexpected event:
+  ,   Received:  ++ maybe None show r
+  ,   Expected:  ++ maybe None show e
+]

commit ghc-yaml for openSUSE:Factory

2015-03-03 Thread h_root 
Hello community,

here is the log from the commit of package ghc-yaml for openSUSE:Factory 
checked in at 2015-03-03 11:14:15

Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yaml.new (New)


Package is ghc-yaml

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes2014-04-02 
17:19:19.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new/ghc-yaml.changes   2015-03-03 
11:14:16.0 +0100
@@ -1,0 +2,6 @@
+Wed Feb 25 08:18:36 UTC 2015 - mplus...@suse.com
+
+- Update to 0.8.10.1:
+  * Add the Data.Yaml.Include module
+
+---

Old:

  yaml-0.8.5.tar.gz

New:

  yaml-0.8.10.1.tar.gz



Other differences:
--
++ ghc-yaml.spec ++
--- /var/tmp/diff_new_pack.E5tjPg/_old  2015-03-03 11:14:17.0 +0100
+++ /var/tmp/diff_new_pack.E5tjPg/_new  2015-03-03 11:14:17.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package ghc
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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,12 +19,12 @@
 %global pkg_name yaml
 
 Name:   ghc-%{pkg_name}
-Version:0.8.5
+Version:0.8.10.1
 Release:0
 Summary:Support for parsing and rendering YAML documents
 License:BSD-3-Clause
 Group:  System/Libraries
-Url:http://hackage.haskell.org/package/%{name}
+Url:http://hackage.haskell.org/package/%{pkg_name}
 Source0:
http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
@@ -36,7 +36,9 @@
 BuildRequires:  ghc-bytestring-devel
 BuildRequires:  ghc-conduit-devel
 BuildRequires:  ghc-containers-devel
+BuildRequires:  ghc-enclosed-exceptions-devel
 BuildRequires:  ghc-resourcet-devel
+BuildRequires:  ghc-scientific-devel
 BuildRequires:  ghc-text-devel
 BuildRequires:  ghc-transformers-devel
 BuildRequires:  ghc-unordered-containers-devel
@@ -77,6 +79,7 @@
 %install
 %ghc_lib_install
 %ghc_fix_dynamic_rpath yaml2json
+%ghc_fix_dynamic_rpath json2yaml
 
 %post devel
 %ghc_pkg_recache
@@ -88,6 +91,7 @@
 %defattr(-,root,root,-)
 %doc LICENSE
 %{_bindir}/yaml2json
+%{_bindir}/json2yaml
 
 %files devel -f %{name}-devel.files
 %defattr(-,root,root,-)

++ yaml-0.8.5.tar.gz - yaml-0.8.10.1.tar.gz ++
 2714 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org