From 34b90aa71cadd05c459797c35d9a100a37225c18742c30b4b613f1b7f2396a2d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 May 2019 01:01:25 +0000 Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-aeson revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-aeson?expand=0&rev=47 --- aeson-1.4.2.0.tar.gz | 3 - aeson-1.4.3.0.tar.gz | 3 + aeson.cabal | 261 ------------------------------------------- ghc-aeson.changes | 18 +++ ghc-aeson.spec | 6 +- 5 files changed, 24 insertions(+), 267 deletions(-) delete mode 100644 aeson-1.4.2.0.tar.gz create mode 100644 aeson-1.4.3.0.tar.gz delete mode 100644 aeson.cabal diff --git a/aeson-1.4.2.0.tar.gz b/aeson-1.4.2.0.tar.gz deleted file mode 100644 index d968855..0000000 --- a/aeson-1.4.2.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:75ce71814a33d5e5568208e6806a8847e7ba47fea74d30f6a8b1b56ecb318bd0 -size 268052 diff --git a/aeson-1.4.3.0.tar.gz b/aeson-1.4.3.0.tar.gz new file mode 100644 index 0000000..f84dd51 --- /dev/null +++ b/aeson-1.4.3.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6564ac0fb429cd4bcafc706fa4b905dab94f57f765ebd96a65c9ba4b9e520c19 +size 272210 diff --git a/aeson.cabal b/aeson.cabal deleted file mode 100644 index 2a79547..0000000 --- a/aeson.cabal +++ /dev/null @@ -1,261 +0,0 @@ -name: aeson -version: 1.4.2.0 -x-revision: 1 -license: BSD3 -license-file: LICENSE -category: Text, Web, JSON -copyright: (c) 2011-2016 Bryan O'Sullivan - (c) 2011 MailRank, Inc. -author: Bryan O'Sullivan -maintainer: Adam Bergmark -stability: experimental -tested-with: GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.1 -synopsis: Fast JSON parsing and encoding -cabal-version: >= 1.10 -homepage: https://github.com/bos/aeson -bug-reports: https://github.com/bos/aeson/issues -build-type: Simple -description: - A JSON parsing and encoding library optimized for ease of use - and high performance. - . - To get started, see the documentation for the @Data.Aeson@ module - below. - . - (A note on naming: in Greek mythology, Aeson was the father of Jason.) - -extra-source-files: - *.yaml - README.markdown - benchmarks/*.cabal - benchmarks/*.hs - benchmarks/*.py - benchmarks/Compare/*.hs - benchmarks/Makefile - benchmarks/Typed/*.hs - benchmarks/json-data/*.json - cbits/*.c - changelog.md - examples/*.cabal - examples/*.hs - examples/Twitter/*.hs - ffi/Data/Aeson/Parser/*.hs - include/*.h - tests/JSONTestSuite/test_parsing/*.json - tests/JSONTestSuite/test_transform/*.json - pure/Data/Aeson/Parser/*.hs - -flag developer - description: operate in developer mode - default: False - manual: True - -flag fast - description: compile without optimizations - default: False - manual: True - -flag bytestring-builder - description: Depend on the bytestring-builder package for backwards compatibility. - default: False - manual: False - -flag cffi - description: Controls whether to include c-ffi bits or pure haskell. Default to False for security. - default: False - manual: True - -library - default-language: Haskell2010 - hs-source-dirs: . attoparsec-iso8601/ - - exposed-modules: - Data.Aeson - Data.Aeson.Encoding - Data.Aeson.Parser - Data.Aeson.Text - Data.Aeson.Types - Data.Aeson.TH - Data.Aeson.QQ.Simple - - Data.Aeson.Encoding.Internal - Data.Aeson.Internal - Data.Aeson.Internal.Time - Data.Aeson.Parser.Internal - - -- Deprecated modules - exposed-modules: - Data.Aeson.Encode - - other-modules: - Data.Aeson.Compat - Data.Aeson.Encoding.Builder - Data.Aeson.Internal.Functions - Data.Aeson.Parser.Unescape - Data.Aeson.Parser.Time - Data.Aeson.Types.FromJSON - Data.Aeson.Types.Generic - Data.Aeson.Types.ToJSON - Data.Aeson.Types.Class - Data.Aeson.Types.Internal - Data.Attoparsec.Time - Data.Attoparsec.Time.Internal - - -- GHC bundled libs - build-depends: - base >= 4.5.0.0 && < 5, - containers >= 0.4.2.1 && < 0.7, - deepseq >= 1.3.0.0 && < 1.5, - ghc-prim >= 0.2 && < 0.6, - template-haskell >= 2.7.0.0 && < 2.15, - text >= 1.2.3.0 && < 1.3, - time >= 1.4 && < 1.9 - - -- Compat - build-depends: - base-compat >= 0.9.1 && < 0.11 - - if flag(bytestring-builder) - build-depends: bytestring >= 0.9.2 && < 0.10.4, - bytestring-builder >= 0.10.4 && < 1 - else - build-depends: bytestring >= 0.10.4 && < 0.11 - - if !impl(ghc >= 8.6) - build-depends: - contravariant >=1.4.1 && <1.6 - - if !impl(ghc >= 8.0) - -- `Data.Semigroup` and `Control.Monad.Fail` and `Control.Monad.IO.Class` are available in base only since GHC 8.0 / base 4.9 - build-depends: - semigroups >= 0.18.5 && < 0.19, - transformers >= 0.3.0.0 && < 0.6, - transformers-compat >= 0.6.2 && < 0.7, - fail == 4.9.* - - if !impl(ghc >= 7.10) - -- `Numeric.Natural` is available in base only since GHC 7.10 / base 4.8 - build-depends: nats >= 1.1.1 && < 1.2, - void >= 0.7.2 && < 0.8 - - -- cannot use latest version - build-depends: - unordered-containers >= 0.2.8.0 && < 0.3, - - -- not in LTS-12.10 - tagged >= 0.8.5 && < 0.9, - primitive >= 0.6.3.0 && < 0.7 - - -- Other dependencies - build-depends: - attoparsec >= 0.13.2.2 && < 0.14, - dlist >= 0.8.0.4 && < 0.9, - hashable >= 1.2.7.0 && < 1.3, - scientific >= 0.3.6.2 && < 0.4, - th-abstraction >= 0.2.8.0 && < 0.3, - time-locale-compat >= 0.1.1.5 && < 0.2, - uuid-types >= 1.0.3 && < 1.1, - vector >= 0.12.0.1 && < 0.13 - - ghc-options: -Wall - - if flag(developer) - ghc-options: -Werror - ghc-prof-options: -auto-all - - if flag(fast) - ghc-options: -O0 - else - ghc-options: -O2 - - include-dirs: include - if impl(ghcjs) || !flag(cffi) - hs-source-dirs: pure - other-modules: Data.Aeson.Parser.UnescapePure - else - c-sources: cbits/unescape_string.c - cpp-options: -DCFFI - hs-source-dirs: ffi - other-modules: Data.Aeson.Parser.UnescapeFFI - -test-suite tests - default-language: Haskell2010 - type: exitcode-stdio-1.0 - hs-source-dirs: tests ffi pure - main-is: Tests.hs - c-sources: cbits/unescape_string.c - ghc-options: -Wall -threaded -rtsopts - - other-modules: - Data.Aeson.Parser.UnescapeFFI - Data.Aeson.Parser.UnescapePure - DataFamilies.Properties - DataFamilies.Instances - DataFamilies.Encoders - DataFamilies.Types - Encoders - ErrorMessages - Functions - Instances - Options - Properties - SerializationFormatSpec - Types - UnitTests - UnitTests.NullaryConstructors - - build-depends: - QuickCheck >= 2.10.0.1 && < 2.12, - aeson, - integer-logarithms >= 1 && <1.1, - attoparsec, - base, - base-compat, - base-orphans >= 0.5.3 && <0.9, - base16-bytestring, - containers, - directory, - dlist, - filepath, - generic-deriving >= 1.10 && < 1.13, - ghc-prim >= 0.2, - hashable >= 1.2.4.0, - scientific, - tagged, - template-haskell, - tasty, - tasty-hunit, - tasty-quickcheck, - text, - time, - time-locale-compat, - unordered-containers, - uuid-types, - vector, - quickcheck-instances >= 0.3.16 - - if flag(bytestring-builder) - build-depends: bytestring >= 0.9 && < 0.10.4, - bytestring-builder >= 0.10.4 && < 1 - else - build-depends: bytestring >= 0.10.4 - - if !impl(ghc >= 8.0) - build-depends: - semigroups >= 0.18.2 && < 0.19, - transformers >= 0.2.2.0, - transformers-compat >= 0.3 - - if !impl(ghc >= 7.10) - build-depends: nats >=1 && <1.2, - void >=0.7.2 && <0.8 - - if impl(ghc >= 7.8) - build-depends: hashable-time >= 0.2 && <0.3 - - if flag(fast) - ghc-options: -fno-enable-rewrite-rules - -source-repository head - type: git - location: git://github.com/bos/aeson.git diff --git a/ghc-aeson.changes b/ghc-aeson.changes index 5a49b46..4ea0f80 100644 --- a/ghc-aeson.changes +++ b/ghc-aeson.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue Apr 30 09:23:03 UTC 2019 - psimons@suse.com + +- Update aeson to version 1.4.3.0. + ### 1.4.3.0 + * Improve error messages for FromJSON in existing instances and GHC Generic implementation. Thanks to Xia Li-Yao & Igor Pashev. + * Tweak error-reporting combinators and their documentation. Thanks to Xia Li-Yao. + * `typeMismatch` is now about comparing JSON types (i.e., the expected and actual names of the Value constructor). + * `withObject` and other `with*` combinators now also mention the JSON types they expect + * New `unexpected` and `prependFailure` combinators. + * Add `Contravariant` `ToJSONKeyFunction` instance. Thanks to Oleg Grenrus. + * Add `KeyValue` instance for `Object`. Thanks to Robert Hensing. + * Improve performance when parsing certain large numbers, thanks to Oleg Grenrus. + * Add `Data.Aeson.QQ.Simple` - A limited version of aeson-qq. Thanks to Oleg Grenrus. + * Exposes internal helper functions like ``, `JSONPath`, and `parseIndexedJSON` from `Data.Aeson` module. Thanks to Abid Uzair. + * Better error messages when there are syntax errors parsing objects and arrays. Thanks to Fintan Halpenny. + * Support building with `th-abstraction-0.3.0.0` or later. Thanks to Ryan Scott. + ------------------------------------------------------------------- Sat Jan 19 12:33:33 UTC 2019 - Peter Simons diff --git a/ghc-aeson.spec b/ghc-aeson.spec index fa3708e..2e561a1 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -19,14 +19,13 @@ %global pkg_name aeson %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.4.2.0 +Version: 1.4.3.0 Release: 0 Summary: Fast JSON parsing and encoding 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 -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-attoparsec-devel BuildRequires: ghc-base-compat-devel @@ -48,6 +47,7 @@ BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-uuid-types-devel BuildRequires: ghc-vector-devel %if %{with tests} +BuildRequires: ghc-Diff-devel BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-base-orphans-devel BuildRequires: ghc-base16-bytestring-devel @@ -58,6 +58,7 @@ BuildRequires: ghc-hashable-time-devel BuildRequires: ghc-integer-logarithms-devel BuildRequires: ghc-quickcheck-instances-devel BuildRequires: ghc-tasty-devel +BuildRequires: ghc-tasty-golden-devel BuildRequires: ghc-tasty-hunit-devel BuildRequires: ghc-tasty-quickcheck-devel %endif @@ -83,7 +84,6 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build