From 54bff12153f6e8f1a04f267e443b0f3c1a014785 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 23 Jul 2023 22:53:24 +0800 Subject: [PATCH] update to 2.1.2.1; add generically --- .gitignore | 5 +++ aeson-2.0.3.0.cabal => aeson-2.1.2.1.cabal | 49 +++++++++++++++------- ghc-aeson.spec | 43 ++++++++++++------- sources | 9 ++-- 4 files changed, 71 insertions(+), 35 deletions(-) rename aeson-2.0.3.0.cabal => aeson-2.1.2.1.cabal (82%) diff --git a/.gitignore b/.gitignore index f11c34f..b213a48 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,8 @@ /semialign-1.2.0.1.tar.gz /witherable-0.4.2.tar.gz /indexed-traversable-instances-0.1.1.1.tar.gz +/aeson-2.1.2.1.tar.gz +/OneTuple-0.4.1.1.tar.gz +/semialign-1.3.tar.gz +/indexed-traversable-instances-0.1.1.2.tar.gz +/generically-0.1.1.tar.gz diff --git a/aeson-2.0.3.0.cabal b/aeson-2.1.2.1.cabal similarity index 82% rename from aeson-2.0.3.0.cabal rename to aeson-2.1.2.1.cabal index 1d46d3a..9963cba 100644 --- a/aeson-2.0.3.0.cabal +++ b/aeson-2.1.2.1.cabal @@ -1,6 +1,6 @@ name: aeson -version: 2.0.3.0 -x-revision: 1 +version: 2.1.2.1 +x-revision: 3 license: BSD3 license-file: LICENSE category: Text, Web, JSON @@ -17,8 +17,11 @@ tested-with: || ==8.4.4 || ==8.6.5 || ==8.8.4 - || ==8.10.4 - || ==9.0.1 + || ==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 @@ -43,6 +46,8 @@ extra-source-files: 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 @@ -63,6 +68,10 @@ library 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.Encoding.Internal Data.Aeson.Internal @@ -77,11 +86,14 @@ library Data.Aeson.Types other-modules: + Data.Aeson.Decoding.Internal Data.Aeson.Encoding.Builder Data.Aeson.Internal.ByteString Data.Aeson.Internal.Functions + 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 @@ -98,14 +110,16 @@ library , bytestring >=0.10.8.1 && <0.12 , containers >=0.5.7.1 && <0.7 , deepseq >=1.4.2.0 && <1.5 - , ghc-prim >=0.5.0.0 && <0.9 - , template-haskell >=2.11.0.0 && <2.19 - , text >=1.2.3.0 && <1.3 || >=2.0 && <2.1 + , 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 + 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) @@ -118,16 +132,16 @@ library , 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.4 - , primitive >=0.7.3.0 && <0.8 + , 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.3 - , strict >=0.4 && <0.5 + , 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.5 - , these >=1.1.1.1 && <1.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 @@ -164,6 +178,7 @@ test-suite aeson-tests ErrorMessages Functions Instances + JSONTestSuite Options Properties PropertyGeneric @@ -173,6 +188,7 @@ test-suite aeson-tests PropertyRTFunctors PropertyTH PropUtils + Regression.Issue967 SerializationFormatSpec Types UnitTests @@ -183,7 +199,7 @@ test-suite aeson-tests , attoparsec , base , base-compat - , base-orphans >=0.5.3 && <0.9 + , base-orphans >=0.5.3 && <0.10 , base16-bytestring , bytestring , containers @@ -193,6 +209,7 @@ test-suite aeson-tests , dlist , filepath , generic-deriving >=1.10 && <1.15 + , generically , ghc-prim >=0.2 , hashable , indexed-traversable @@ -200,7 +217,7 @@ test-suite aeson-tests , OneTuple , primitive , QuickCheck >=2.14.2 && <2.15 - , quickcheck-instances >=0.3.26.1 && <0.4 + , quickcheck-instances >=0.3.29 && <0.4 , scientific , strict , tagged diff --git a/ghc-aeson.spec b/ghc-aeson.spec index f9bf1c2..3a1f79f 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -1,21 +1,22 @@ -# generated by cabal-rpm-2.1.0 --subpackage +# generated by cabal-rpm-2.1.2 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name aeson %global pkgver %{pkg_name}-%{version} -%global indexedtraversableinstances indexed-traversable-instances-0.1.1.1 -%global OneTuple OneTuple-0.3.1 -%global semialign semialign-1.2.0.1 +%global indexedtraversableinstances indexed-traversable-instances-0.1.1.2 +%global OneTuple OneTuple-0.4.1.1 +%global semialign semialign-1.3 %global witherable witherable-0.4.2 -%global subpkgs %{OneTuple} %{indexedtraversableinstances} %{semialign} %{witherable} +%global generically generically-0.1.1 +%global subpkgs %{OneTuple} %{indexedtraversableinstances} %{semialign} %{witherable} %{generically} -# testsuite missing deps: OneTuple quickcheck-instances tasty-golden +# testsuite missing deps: quickcheck-instances tasty-golden Name: ghc-%{pkg_name} -Version: 2.0.3.0 +Version: 2.1.2.1 # can only be reset when all subpkgs bumped -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast JSON parsing and encoding License: BSD-3-Clause @@ -26,7 +27,8 @@ Source1: https://hackage.haskell.org/package/%{OneTuple}/%{OneTuple}.tar. Source2: https://hackage.haskell.org/package/%{semialign}/%{semialign}.tar.gz Source3: https://hackage.haskell.org/package/%{witherable}/%{witherable}.tar.gz Source4: https://hackage.haskell.org/package/%{indexedtraversableinstances}/%{indexedtraversableinstances}.tar.gz -Source5: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal +Source5: https://hackage.haskell.org/package/%{generically}/%{generically}.tar.gz +Source6: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources # Begin cabal-rpm deps: @@ -42,6 +44,8 @@ BuildRequires: ghc-containers-devel BuildRequires: ghc-data-fix-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-dlist-devel +BuildRequires: ghc-exceptions-devel +#BuildRequires: ghc-generically-devel BuildRequires: ghc-hashable-devel BuildRequires: ghc-indexed-traversable-devel BuildRequires: ghc-primitive-devel @@ -71,6 +75,8 @@ BuildRequires: ghc-containers-prof BuildRequires: ghc-data-fix-prof BuildRequires: ghc-deepseq-prof BuildRequires: ghc-dlist-prof +BuildRequires: ghc-exceptions-prof +#BuildRequires: ghc-generically-prof BuildRequires: ghc-hashable-prof BuildRequires: ghc-indexed-traversable-prof BuildRequires: ghc-primitive-prof @@ -91,23 +97,24 @@ BuildRequires: ghc-vector-prof #BuildRequires: ghc-witherable-prof %endif # for missing dep 'semialign': -#BuildRequires: ghc-indexed-traversable-instances-devel BuildRequires: ghc-semigroupoids-devel BuildRequires: ghc-transformers-devel %if %{with ghc_prof} -#BuildRequires: ghc-indexed-traversable-instances-prof BuildRequires: ghc-semigroupoids-prof BuildRequires: ghc-transformers-prof %endif # for missing dep 'witherable': BuildRequires: ghc-base-orphans-devel -#BuildRequires: ghc-indexed-traversable-instances-devel BuildRequires: ghc-transformers-devel %if %{with ghc_prof} BuildRequires: ghc-base-orphans-prof -#BuildRequires: ghc-indexed-traversable-instances-prof BuildRequires: ghc-transformers-prof %endif +# for missing dep 'generically': +BuildRequires: ghc-base-orphans-devel +%if %{with ghc_prof} +BuildRequires: ghc-base-orphans-prof +%endif # End cabal-rpm deps %description @@ -157,6 +164,7 @@ This package provides the Haskell %{pkg_name} profiling library. %ghc_lib_subpackage -l BSD-3-Clause %{OneTuple} %ghc_lib_subpackage -l BSD-3-Clause %{semialign} %ghc_lib_subpackage -l BSD-3-Clause %{witherable} +%ghc_lib_subpackage -l BSD-3-Clause %{generically} %endif %global version %{main_version} @@ -164,12 +172,14 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: -%setup -q -n %{pkgver} -a1 -a2 -a3 -a4 -cp -bp %{SOURCE5} %{pkg_name}.cabal +%setup -q -n %{pkgver} -a1 -a2 -a3 -a4 -a5 +cp -bp %{SOURCE6} %{pkg_name}.cabal # End cabal-rpm setup ( cd %{witherable} +cabal-tweak-dep-ver base-orphans '<0.9' '<0.10' cabal-tweak-dep-ver hashable '<1.4' '<1.5' +cabal-tweak-dep-ver vector '<0.13' '<0.14' ) @@ -209,6 +219,9 @@ cabal-tweak-dep-ver hashable '<1.4' '<1.5' %changelog +* Sun Jul 23 2023 Jens Petersen - 2.1.2.1-3 +- https://hackage.haskell.org/package/aeson-2.1.2.1/changelog + * Wed Jul 19 2023 Fedora Release Engineering - 2.0.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 0b00f73..b438c28 100644 --- a/sources +++ b/sources @@ -1,5 +1,6 @@ -SHA512 (aeson-2.0.3.0.tar.gz) = 546adaaf864ca40012a268d71f442479f0ad7c69e9f943391801570e227a2faa652494766f1f63b77c730e019e83ebdd7511426baa12792a28fbb470eca64552 -SHA512 (OneTuple-0.3.1.tar.gz) = 92678ca3e05c6da7d60e460efa88dbd8c19f8ec6b149dc5a9a493f93bd944b7d0c3ac650a3c1ad9d3742bc2a8bfaef1bab8a6e4ba71ebbb1fc0c9f7a07c0906c -SHA512 (semialign-1.2.0.1.tar.gz) = ba4c680ec2f301c6b76e2198a422bd9c540915fd89a12cbb1787e95c0ccd1bb05abdf59ab1678f46141939673418c650d9624af2ddb7370f2b6bccf704ade83d +SHA512 (aeson-2.1.2.1.tar.gz) = c7e3c5d61ac99b7e66a468cdcd0a20c9d0f42142b2398086aa1a3a992c60814c9d7505e4c15120fb00f0015ab1fb5592d6acdb31995e7af956f2867b95f12a40 +SHA512 (OneTuple-0.4.1.1.tar.gz) = ee82a427558ad81ec95884794871c1a9245fefe32e21500e82d4f0539e4677dd6048e82bfd0f2b02c6d1a52d4d2392bb8f969c4fd663c35f4f7348a97aba8a26 +SHA512 (semialign-1.3.tar.gz) = 4f8ce9c01a145e16f5b203c4ffc0131c42f1d348e2d9c812fc83107a8a4515507da335fa2690f3740d9c89d4d8f2c88fd3b9c9e1862f4726a0874f773a3569b3 SHA512 (witherable-0.4.2.tar.gz) = 14ad590e24b93fc25f16fecaf71d6f9f891a903dd76e052d9f6c21b464f0d28df4f019d33ac36086341a6c5bd20833d7b0c2d19543460d1530899c0c25cea852 -SHA512 (indexed-traversable-instances-0.1.1.1.tar.gz) = a7d0d33cae09e848949d8d3d7d7c4cd118d6b073a30a5bb3f872ebb7ad349dbad808f61e5efe325cdd3717f4969e00012bca81fe1a017daf6ca98e921ef65b35 +SHA512 (indexed-traversable-instances-0.1.1.2.tar.gz) = 8e4e53054105155e2bc6637348f91548e49c422c87de659193aa917a1ca69e5b157c30f5bfb213661112d28185f87bb9cc453a57e5960042c82b5654d444ba1f +SHA512 (generically-0.1.1.tar.gz) = 029c96a5567fea56572ad5522c70d3b41a22ddac15483aee0045f4aa15bc45bf177a69bf42986391de681ab98aedf5b748a91d5bd5486427062f72e2a22a1844