diff --git a/aeson-1.5.6.0.tar.gz b/aeson-1.5.6.0.tar.gz deleted file mode 100644 index b01a595..0000000 --- a/aeson-1.5.6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0361c34be3d2ec945201f02501693436fbda10dcc549469481a084b2de22bfe8 -size 286364 diff --git a/aeson-2.1.2.1.tar.gz b/aeson-2.1.2.1.tar.gz new file mode 100644 index 0000000..440846a --- /dev/null +++ b/aeson-2.1.2.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d4042b903ce181ee023bbf908f37a3f55e820c5f0df102683b87f963e3522c6 +size 335908 diff --git a/aeson.cabal b/aeson.cabal index 1a7d259..1a5930e 100644 --- a/aeson.cabal +++ b/aeson.cabal @@ -1,257 +1,239 @@ -name: aeson -version: 1.5.6.0 -x-revision: 5 -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.8.4, GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.3, GHC == 8.10.1 -synopsis: Fast JSON parsing and encoding -cabal-version: >= 1.10 -homepage: https://github.com/haskell/aeson -bug-reports: https://github.com/haskell/aeson/issues -build-type: Simple +name: aeson +version: 2.1.2.1 +x-revision: 3 +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 ==8.0.2 + || ==8.2.2 + || ==8.4.4 + || ==8.6.5 + || ==8.8.4 + || ==8.10.7 + || ==9.0.2 + || ==9.2.7 + || ==9.4.4 + || ==9.6.1 + +synopsis: Fast JSON parsing and encoding +cabal-version: >=1.10 +homepage: https://github.com/haskell/aeson +bug-reports: https://github.com/haskell/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.) + 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 - cbits/*.c - changelog.md - include/*.h - tests/JSONTestSuite/test_parsing/*.json - tests/JSONTestSuite/test_transform/*.json - tests/golden/*.expected - src-ffi/Data/Aeson/Parser/*.hs - src-pure/Data/Aeson/Parser/*.hs - benchmarks/json-data/*.json - -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 + *.yaml + benchmarks/json-data/*.json + cbits/*.c + changelog.md + README.markdown + src-ffi/Data/Aeson/Parser/*.hs + src-pure/Data/Aeson/Parser/*.hs + tests/golden/*.expected + tests/JSONTestSuite/results/*.tok + tests/JSONTestSuite/results/*.txt + tests/JSONTestSuite/test_parsing/*.json + tests/JSONTestSuite/test_transform/*.json flag cffi - description: Controls whether to include c-ffi bits or pure haskell. Default to False for security. - default: False - manual: True + description: + Controls whether to include c-ffi bits or pure haskell. Default to False for security. + + default: False + manual: True + +flag ordered-keymap + description: Use ordered @Data.Map.Strict@ for KeyMap implementation. + default: True + manual: True library default-language: Haskell2010 - hs-source-dirs: src attoparsec-iso8601/src - + hs-source-dirs: src attoparsec-iso8601/src exposed-modules: Data.Aeson + Data.Aeson.Decoding + Data.Aeson.Decoding.ByteString + Data.Aeson.Decoding.ByteString.Lazy + Data.Aeson.Decoding.Tokens 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.Key + Data.Aeson.KeyMap + Data.Aeson.Parser Data.Aeson.Parser.Internal - - -- Deprecated modules - exposed-modules: - Data.Aeson.Encode + Data.Aeson.QQ.Simple + Data.Aeson.Text + Data.Aeson.TH + Data.Aeson.Types other-modules: + Data.Aeson.Decoding.Internal Data.Aeson.Encoding.Builder + Data.Aeson.Internal.ByteString Data.Aeson.Internal.Functions - Data.Aeson.Parser.Unescape + Data.Aeson.Internal.Integer + Data.Aeson.Internal.Text + Data.Aeson.Internal.TH + Data.Aeson.Internal.Word8 Data.Aeson.Parser.Time + Data.Aeson.Parser.Unescape + Data.Aeson.Types.Class Data.Aeson.Types.FromJSON Data.Aeson.Types.Generic - Data.Aeson.Types.ToJSON - Data.Aeson.Types.Class Data.Aeson.Types.Internal + Data.Aeson.Types.ToJSON Data.Attoparsec.Time Data.Attoparsec.Time.Internal -- GHC bundled libs build-depends: - base >= 4.7.0.0 && < 5, - bytestring >= 0.10.4.0 && < 0.11.2, - containers >= 0.5.5.1 && < 0.7, - deepseq >= 1.3.0.0 && < 1.5, - ghc-prim >= 0.2 && < 0.8, - template-haskell >= 2.9.0.0 && < 2.18, - text >= 1.2.3.0 && < 1.3, - time >= 1.4 && < 1.13 - - if impl(ghc >= 8.0) - build-depends: bytestring >= 0.10.8.1 + base >=4.9.0.0 && <5 + , bytestring >=0.10.8.1 && <0.12 + , containers >=0.5.7.1 && <0.7 + , deepseq >=1.4.2.0 && <1.5 + , exceptions >=0.10.4 && <0.11 + , ghc-prim >=0.5.0.0 && <0.11 + , template-haskell >=2.11.0.0 && <2.21 + , text >=1.2.3.0 && <1.3 || >=2.0 && <2.1 + , time >=1.6.0.1 && <1.13 -- Compat build-depends: - base-compat-batteries >= 0.10.0 && < 0.13, - time-compat >= 1.9.4 && < 1.10 + base-compat-batteries >=0.10.0 && <0.14 + , generically >=0.1 && <0.2 + , time-compat >=1.9.6 && <1.10 - 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.21, - transformers >= 0.3.0.0 && < 0.7, - transformers-compat >= 0.6.2 && < 0.8, - 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 + if !impl(ghc >=8.6) + build-depends: contravariant >=1.4.1 && <1.6 -- Other dependencies build-depends: - attoparsec >= 0.13.2.2 && < 0.15, - data-fix >= 0.3 && < 0.4, - dlist >= 0.8.0.4 && < 1.1, - hashable >= 1.2.7.0 && < 1.4, - primitive >= 0.7.0.1 && < 0.8, - scientific >= 0.3.6.2 && < 0.4, - strict >= 0.4 && < 0.5, - tagged >= 0.8.6 && < 0.9, - th-abstraction >= 0.2.8.0 && < 0.5, - these >= 1.1 && < 1.2, - unordered-containers >= 0.2.10.0 && < 0.3, - uuid-types >= 1.0.3 && < 1.1, - vector >= 0.12.0.1 && < 0.13 + attoparsec >=0.14.2 && <0.15 + , data-fix >=0.3.2 && <0.4 + , dlist >=0.8.0.4 && <1.1 + , hashable >=1.3.5.0 && <1.5 + , indexed-traversable >=0.1.2 && <0.2 + , OneTuple >=0.3.1 && <0.5 + , primitive >=0.7.3.0 && <0.9 + , QuickCheck >=2.14.2 && <2.15 + , scientific >=0.3.7.0 && <0.4 + , semialign >=1.2 && <1.4 + , strict >=0.4 && <0.6 + , tagged >=0.8.6 && <0.9 + , text-short >=0.1.5 && <0.2 + , th-abstraction >=0.3.0.0 && <0.6 + , these >=1.1.1.1 && <1.3 + , unordered-containers >=0.2.10.0 && <0.3 + , uuid-types >=1.0.5 && <1.1 + , vector >=0.12.0.1 && <0.14 + , witherable >=0.4.2 && <0.5 - ghc-options: -Wall + 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) + if (impl(ghcjs) || !flag(cffi)) hs-source-dirs: src-pure - other-modules: Data.Aeson.Parser.UnescapePure + other-modules: Data.Aeson.Parser.UnescapePure + else - c-sources: cbits/unescape_string.c - cpp-options: -DCFFI + c-sources: cbits/unescape_string.c + cpp-options: -DCFFI hs-source-dirs: src-ffi - other-modules: Data.Aeson.Parser.UnescapeFFI + other-modules: Data.Aeson.Parser.UnescapeFFI + build-depends: text <2.0 + + if flag(ordered-keymap) + cpp-options: -DUSE_ORDEREDMAP=1 test-suite aeson-tests default-language: Haskell2010 - type: exitcode-stdio-1.0 - hs-source-dirs: tests src-ffi src-pure - main-is: Tests.hs - c-sources: cbits/unescape_string.c - ghc-options: -Wall -threaded -rtsopts - + type: exitcode-stdio-1.0 + hs-source-dirs: tests + main-is: Tests.hs + ghc-options: -Wall -threaded -rtsopts other-modules: - Data.Aeson.Parser.UnescapeFFI - Data.Aeson.Parser.UnescapePure - DataFamilies.Properties - DataFamilies.Instances DataFamilies.Encoders + DataFamilies.Instances + DataFamilies.Properties DataFamilies.Types Encoders ErrorMessages Functions Instances + JSONTestSuite Options - PropUtils Properties PropertyGeneric PropertyKeys + PropertyQC PropertyRoundTrip PropertyRTFunctors PropertyTH + PropUtils + Regression.Issue967 SerializationFormatSpec Types UnitTests UnitTests.NullaryConstructors build-depends: - QuickCheck >= 2.14.2 && < 2.15, - aeson, - integer-logarithms >= 1 && <1.1, - attoparsec, - base, - base-compat, - base-orphans >= 0.5.3 && <0.9, - base16-bytestring, - containers, - data-fix, - directory, - dlist, - Diff >= 0.4 && < 0.5, - filepath, - generic-deriving >= 1.10 && < 1.15, - ghc-prim >= 0.2, - hashable >= 1.2.4.0, - hashable-time >= 0.2.1 && <0.3, - scientific, - strict, - tagged, - template-haskell, - tasty, - tasty-golden, - tasty-hunit, - tasty-quickcheck, - text, - these, - time, - time-compat, - unordered-containers, - uuid-types, - vector, - quickcheck-instances >= 0.3.25.2 && <0.4 - - 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.20, - 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 flag(fast) - ghc-options: -fno-enable-rewrite-rules + aeson + , attoparsec + , base + , base-compat + , base-orphans >=0.5.3 && <0.10 + , base16-bytestring + , bytestring + , containers + , data-fix + , Diff >=0.4 && <0.5 + , directory + , dlist + , filepath + , generic-deriving >=1.10 && <1.15 + , generically + , ghc-prim >=0.2 + , hashable + , indexed-traversable + , integer-logarithms >=1 && <1.1 + , OneTuple + , primitive + , QuickCheck >=2.14.2 && <2.15 + , quickcheck-instances >=0.3.29 && <0.4 + , scientific + , strict + , tagged + , tasty + , tasty-golden + , tasty-hunit + , tasty-quickcheck + , template-haskell + , text + , text-short + , these + , time + , time-compat + , unordered-containers + , uuid-types + , vector source-repository head type: git diff --git a/ghc-aeson.changes b/ghc-aeson.changes index 3771001..55da0af 100644 --- a/ghc-aeson.changes +++ b/ghc-aeson.changes @@ -1,3 +1,46 @@ +------------------------------------------------------------------- +Sun Mar 19 14:43:54 UTC 2023 - Peter Simons + +- Update aeson to version 2.1.2.1 revision 3. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- +Wed Mar 15 14:37:44 UTC 2023 - Peter Simons + +- Update aeson to version 2.1.2.1 revision 2. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- +Wed Mar 1 11:15:32 UTC 2023 - Peter Simons + +- Update aeson to version 2.1.2.1 revision 1. + ### 2.1.2.1 + + * Support `th-abstraction-0.5` + + ### 2.1.2.0 + + * Add `throwDecode :: (MonadThrow m, FromJSON a) => ByteString -> m a` + and variants. + * Add `Data.Aeson.Decoding` which uses new underlying tokenizer / parser. + This parser seems to be faster, and the intermediate `Tokens` streams + allow to differentiate more than `Value` if needed. + If no critical issues is found, this parser will become the default + in next major `aeson` version. + * Support deriving for empty datatypes (such as `Void` and `V1`) + in `FromJSON` and `ToJSON`. + * Add `To/FromJSONKey Void` instances + * Fix `FromJSONKey Double` handling of infinities + +------------------------------------------------------------------- +Wed Sep 21 15:17:01 UTC 2022 - Peter Simons + +- Update aeson to version 2.1.1.0. + Upstream has edited the change log file since the last release in + a non-trivial way, i.e. they did more than just add a new entry + at the top. You can review the file at: + http://hackage.haskell.org/package/aeson-2.1.1.0/src/changelog.md + ------------------------------------------------------------------- Sat Dec 11 17:27:48 UTC 2021 - Peter Simons diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 4d6a34c..92a07c3 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-aeson # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,55 +17,106 @@ %global pkg_name aeson +%global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.5.6.0 +Version: 2.1.2.1 Release: 0 Summary: Fast JSON parsing and encoding License: BSD-3-Clause 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/5.cabal#/%{pkg_name}.cabal +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/3.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-OneTuple-devel +BuildRequires: ghc-OneTuple-prof +BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-QuickCheck-prof BuildRequires: ghc-attoparsec-devel +BuildRequires: ghc-attoparsec-prof BuildRequires: ghc-base-compat-batteries-devel +BuildRequires: ghc-base-compat-batteries-prof +BuildRequires: ghc-base-devel +BuildRequires: ghc-base-prof BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-bytestring-prof BuildRequires: ghc-containers-devel +BuildRequires: ghc-containers-prof BuildRequires: ghc-data-fix-devel +BuildRequires: ghc-data-fix-prof BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-deepseq-prof BuildRequires: ghc-dlist-devel +BuildRequires: ghc-dlist-prof +BuildRequires: ghc-exceptions-devel +BuildRequires: ghc-exceptions-prof +BuildRequires: ghc-generically-devel +BuildRequires: ghc-generically-prof BuildRequires: ghc-hashable-devel +BuildRequires: ghc-hashable-prof +BuildRequires: ghc-indexed-traversable-devel +BuildRequires: ghc-indexed-traversable-prof BuildRequires: ghc-primitive-devel +BuildRequires: ghc-primitive-prof BuildRequires: ghc-rpm-macros BuildRequires: ghc-scientific-devel +BuildRequires: ghc-scientific-prof +BuildRequires: ghc-semialign-devel +BuildRequires: ghc-semialign-prof BuildRequires: ghc-strict-devel +BuildRequires: ghc-strict-prof BuildRequires: ghc-tagged-devel +BuildRequires: ghc-tagged-prof BuildRequires: ghc-template-haskell-devel +BuildRequires: ghc-template-haskell-prof BuildRequires: ghc-text-devel +BuildRequires: ghc-text-prof +BuildRequires: ghc-text-short-devel +BuildRequires: ghc-text-short-prof BuildRequires: ghc-th-abstraction-devel +BuildRequires: ghc-th-abstraction-prof BuildRequires: ghc-these-devel +BuildRequires: ghc-these-prof BuildRequires: ghc-time-compat-devel +BuildRequires: ghc-time-compat-prof BuildRequires: ghc-time-devel +BuildRequires: ghc-time-prof BuildRequires: ghc-unordered-containers-devel +BuildRequires: ghc-unordered-containers-prof BuildRequires: ghc-uuid-types-devel +BuildRequires: ghc-uuid-types-prof BuildRequires: ghc-vector-devel +BuildRequires: ghc-vector-prof +BuildRequires: ghc-witherable-devel +BuildRequires: ghc-witherable-prof ExcludeArch: %{ix86} %if %{with tests} BuildRequires: ghc-Diff-devel -BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-Diff-prof BuildRequires: ghc-base-compat-devel +BuildRequires: ghc-base-compat-prof BuildRequires: ghc-base-orphans-devel +BuildRequires: ghc-base-orphans-prof BuildRequires: ghc-base16-bytestring-devel +BuildRequires: ghc-base16-bytestring-prof BuildRequires: ghc-directory-devel +BuildRequires: ghc-directory-prof BuildRequires: ghc-filepath-devel +BuildRequires: ghc-filepath-prof BuildRequires: ghc-generic-deriving-devel -BuildRequires: ghc-hashable-time-devel +BuildRequires: ghc-generic-deriving-prof BuildRequires: ghc-integer-logarithms-devel +BuildRequires: ghc-integer-logarithms-prof BuildRequires: ghc-quickcheck-instances-devel +BuildRequires: ghc-quickcheck-instances-prof BuildRequires: ghc-tasty-devel BuildRequires: ghc-tasty-golden-devel +BuildRequires: ghc-tasty-golden-prof BuildRequires: ghc-tasty-hunit-devel +BuildRequires: ghc-tasty-hunit-prof +BuildRequires: ghc-tasty-prof BuildRequires: ghc-tasty-quickcheck-devel +BuildRequires: ghc-tasty-quickcheck-prof %endif %description @@ -86,6 +137,22 @@ Requires(postun): ghc-compiler = %{ghc_version} %description devel This package provides the Haskell %{pkg_name} library development files. +%package -n ghc-%{pkg_name}-doc +Summary: Haskell %{pkg_name} library documentation +Requires: ghc-filesystem +BuildArch: noarch + +%description -n ghc-%{pkg_name}-doc +This package provides the Haskell %{pkg_name} library documentation. + +%package -n ghc-%{pkg_name}-prof +Summary: Haskell %{pkg_name} profiling library +Requires: ghc-%{pkg_name}-devel = %{version}-%{release} +Supplements: (ghc-%{pkg_name}-devel and ghc-prof) + +%description -n ghc-%{pkg_name}-prof +This package provides the Haskell %{pkg_name} profiling library. + %prep %autosetup -n %{pkg_name}-%{version} cp -p %{SOURCE1} %{pkg_name}.cabal @@ -111,4 +178,9 @@ cp -p %{SOURCE1} %{pkg_name}.cabal %files devel -f %{name}-devel.files %doc README.markdown changelog.md +%files -n ghc-%{pkg_name}-doc -f ghc-%{pkg_name}-doc.files +%license LICENSE + +%files -n ghc-%{pkg_name}-prof -f ghc-%{pkg_name}-prof.files + %changelog