From d2cc4302abd3b5c30f0ad3c651c4003595a76d0dc8a4e0bf088872e47aeb953e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 May 2024 13:00:25 +0000 Subject: [PATCH 1/2] osc copypac from project:devel:languages:haskell:ghc-9.8.x package:ghc-aeson revision:3, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-aeson?expand=0&rev=87 --- aeson-2.2.1.0.tar.gz | 3 -- aeson-2.2.2.0.tar.gz | 3 ++ aeson.cabal | 85 +++++++++++++++++++++----------------------- ghc-aeson.changes | 9 +++++ ghc-aeson.spec | 6 ++-- 5 files changed, 56 insertions(+), 50 deletions(-) delete mode 100644 aeson-2.2.1.0.tar.gz create mode 100644 aeson-2.2.2.0.tar.gz diff --git a/aeson-2.2.1.0.tar.gz b/aeson-2.2.1.0.tar.gz deleted file mode 100644 index 7c91730..0000000 --- a/aeson-2.2.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:914eefd0e80d12db5c721daa2cbab427acee39795f125c5460c1fe48cf9a5d7f -size 341038 diff --git a/aeson-2.2.2.0.tar.gz b/aeson-2.2.2.0.tar.gz new file mode 100644 index 0000000..ec8f55e --- /dev/null +++ b/aeson-2.2.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3bde1446333f92bba035f6f1b94031d3e2f1342dd63b062f5f2132309fd6276 +size 340787 diff --git a/aeson.cabal b/aeson.cabal index fce03b8..0883f5e 100644 --- a/aeson.cabal +++ b/aeson.cabal @@ -1,7 +1,8 @@ +cabal-version: 2.2 name: aeson -version: 2.2.1.0 +version: 2.2.2.0 x-revision: 1 -license: BSD3 +license: BSD-3-Clause license-file: LICENSE category: Text, Web, JSON copyright: @@ -12,19 +13,17 @@ author: Bryan O'Sullivan maintainer: Adam Bergmark stability: experimental tested-with: - GHC ==8.2.2 - || ==8.4.4 - || ==8.6.5 + GHC ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 - || ==9.4.7 - || ==9.6.3 - || ==9.8.1 + || ==9.4.8 + || ==9.6.5 + || ==9.8.2 + || ==9.10.1 synopsis: Fast JSON parsing and encoding -cabal-version: 1.12 homepage: https://github.com/haskell/aeson bug-reports: https://github.com/haskell/aeson/issues build-type: Simple @@ -85,8 +84,6 @@ library Data.Aeson.Internal.TH Data.Aeson.Internal.Unescape Data.Aeson.Internal.UnescapeFromText - Data.Aeson.Internal.Word8 - Data.Aeson.Internal.Word16 Data.Aeson.Parser.Time Data.Aeson.Types.Class Data.Aeson.Types.FromJSON @@ -96,51 +93,49 @@ library -- GHC bundled libs build-depends: - base >=4.10.0.0 && <5 + , base >=4.12.0.0 && <5 , bytestring >=0.10.8.2 && <0.13 - , containers >=0.5.10.2 && <0.7 - , deepseq >=1.4.3.0 && <1.6 + , containers >=0.6.0.1 && <0.8 + , deepseq >=1.4.4.0 && <1.6 , exceptions >=0.10.4 && <0.11 , ghc-prim >=0.5.0.0 && <0.12 - , template-haskell >=2.12.0.0 && <2.22 + , template-haskell >=2.14.0.0 && <2.23 , text >=1.2.3.0 && <1.3 || >=2.0 && <2.2 , time >=1.8.0.2 && <1.13 -- Compat build-depends: - generically >=0.1 && <0.2 + , 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 >=9.0) build-depends: integer-gmp -- Other dependencies build-depends: - data-fix >=0.3.2 && <0.4 - , dlist >=1.0 && <1.1 - , hashable >=1.4.2.0 && <1.5 - , indexed-traversable >=0.1.2 && <0.2 - , integer-conversion >=0.1 && <0.2 - , integer-logarithms >=1.0.3.1 && <1.1 - , network-uri >=2.6.4.1 && <2.7 - , OneTuple >=0.4.1.1 && <0.5 - , primitive >=0.8.0.0 && <0.10 - , QuickCheck >=2.14.3 && <2.15 - , scientific >=0.3.7.0 && <0.4 - , semialign >=1.3 && <1.4 - , strict >=0.5 && <0.6 - , tagged >=0.8.7 && <0.9 - , text-iso8601 >=0.1 && <0.2 - , text-short >=0.1.5 && <0.2 - , th-abstraction >=0.5.0.0 && <0.7 - , these >=1.2 && <1.3 - , unordered-containers >=0.2.10.0 && <0.3 - , uuid-types >=1.0.5 && <1.1 - , vector >=0.13.0.0 && <0.14 - , witherable >=0.4.2 && <0.5 + , character-ps ^>=0.1 + , data-fix ^>=0.3.2 + , dlist ^>=1.0 + , hashable ^>=1.4.2.0 + , indexed-traversable ^>=0.1.2 + , integer-conversion ^>=0.1 + , integer-logarithms ^>=1.0.3.1 + , network-uri ^>=2.6.4.1 + , OneTuple ^>=0.4.1.1 + , primitive ^>=0.8.0.0 || ^>=0.9.0.0 + , QuickCheck ^>=2.14.3 || ^>=2.15 + , scientific ^>=0.3.7.0 + , semialign ^>=1.3 + , strict ^>=0.5 + , tagged ^>=0.8.7 + , text-iso8601 ^>=0.1.1 + , text-short ^>=0.1.5 + , th-abstraction ^>=0.5.0.0 || ^>=0.6.0.0 || ^>=0.7.0.0 + , these ^>=1.2 + , unordered-containers ^>=0.2.10.0 + , uuid-types ^>=1.0.5 + , vector ^>=0.13.0.0 + , witherable ^>=0.4.2 || ^>=0.5 ghc-options: -Wall @@ -199,7 +194,7 @@ test-suite aeson-tests UnitTests.UTCTime build-depends: - aeson + , aeson , base , base-compat , base-orphans >=0.5.3 && <0.10 @@ -208,7 +203,7 @@ test-suite aeson-tests , containers , data-fix , deepseq - , Diff >=0.4 && <0.5 + , Diff >=0.4 && <0.6 , directory , dlist , filepath @@ -221,7 +216,7 @@ test-suite aeson-tests , network-uri , OneTuple , primitive - , QuickCheck >=2.14.2 && <2.15 + , QuickCheck >=2.14.2 && <2.16 , quickcheck-instances >=0.3.29 && <0.4 , scientific , strict @@ -244,7 +239,7 @@ test-suite aeson-tests build-depends: integer-gmp if impl(ghc >=9.2 && <9.7) - build-depends: nothunks >=0.1.4 && <0.2 + build-depends: nothunks >=0.1.4 && <0.3 source-repository head type: git diff --git a/ghc-aeson.changes b/ghc-aeson.changes index 6417053..d731f30 100644 --- a/ghc-aeson.changes +++ b/ghc-aeson.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri May 17 03:42:00 UTC 2024 - Peter Simons + +- Update aeson to version 2.2.2.0 revision 1. + ### 2.2.2.0 + + * Support GHC-8.6.5...9.10.1 + * Depend on `character-ps` instead of defining own Word8 pattern synonyms + ------------------------------------------------------------------- Mon Oct 16 15:54:05 UTC 2023 - Peter Simons diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 0e86c8f..b432a91 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-aeson # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 2.2.1.0 +Version: 2.2.2.0 Release: 0 Summary: Fast JSON parsing and encoding License: BSD-3-Clause @@ -36,6 +36,8 @@ BuildRequires: ghc-base-devel BuildRequires: ghc-base-prof BuildRequires: ghc-bytestring-devel BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-character-ps-devel +BuildRequires: ghc-character-ps-prof BuildRequires: ghc-containers-devel BuildRequires: ghc-containers-prof BuildRequires: ghc-data-fix-devel From 3b6c81c3d1695096e3dadfb8b9e7a00dc92699c8a4afed52d3ff34c5805615ac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 13 Jun 2024 21:00:53 +0000 Subject: [PATCH 2/2] osc copypac from project:devel:languages:haskell:ghc-9.8.x package:ghc-aeson revision:4, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-aeson?expand=0&rev=88 --- aeson-2.2.2.0.tar.gz | 3 - aeson-2.2.3.0.tar.gz | 3 + aeson.cabal | 246 ------------------------------------------- ghc-aeson.changes | 11 ++ ghc-aeson.spec | 4 +- 5 files changed, 15 insertions(+), 252 deletions(-) delete mode 100644 aeson-2.2.2.0.tar.gz create mode 100644 aeson-2.2.3.0.tar.gz delete mode 100644 aeson.cabal diff --git a/aeson-2.2.2.0.tar.gz b/aeson-2.2.2.0.tar.gz deleted file mode 100644 index ec8f55e..0000000 --- a/aeson-2.2.2.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b3bde1446333f92bba035f6f1b94031d3e2f1342dd63b062f5f2132309fd6276 -size 340787 diff --git a/aeson-2.2.3.0.tar.gz b/aeson-2.2.3.0.tar.gz new file mode 100644 index 0000000..3291f2e --- /dev/null +++ b/aeson-2.2.3.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:daa25cf428256ad05d21f2bfa44077c1b14d6c784b7930a202ee901f11cc6baa +size 340855 diff --git a/aeson.cabal b/aeson.cabal deleted file mode 100644 index 0883f5e..0000000 --- a/aeson.cabal +++ /dev/null @@ -1,246 +0,0 @@ -cabal-version: 2.2 -name: aeson -version: 2.2.2.0 -x-revision: 1 -license: BSD-3-Clause -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.6.5 - || ==8.8.4 - || ==8.10.7 - || ==9.0.2 - || ==9.2.8 - || ==9.4.8 - || ==9.6.5 - || ==9.8.2 - || ==9.10.1 - -synopsis: Fast JSON parsing and encoding -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.) - -extra-source-files: - *.yaml - benchmarks/json-data/*.json - changelog.md - README.markdown - tests/golden/*.expected - tests/JSONTestSuite/results/*.tok - tests/JSONTestSuite/results/*.txt - tests/JSONTestSuite/test_parsing/*.json - tests/JSONTestSuite/test_transform/*.json - -flag ordered-keymap - description: Use ordered @Data.Map.Strict@ for KeyMap implementation. - default: True - manual: True - -library - default-language: Haskell2010 - hs-source-dirs: src - exposed-modules: - Data.Aeson - Data.Aeson.Decoding - Data.Aeson.Decoding.ByteString - Data.Aeson.Decoding.ByteString.Lazy - Data.Aeson.Decoding.Text - Data.Aeson.Decoding.Tokens - Data.Aeson.Encoding - Data.Aeson.Encoding.Internal - Data.Aeson.Key - Data.Aeson.KeyMap - Data.Aeson.QQ.Simple - Data.Aeson.RFC8785 - Data.Aeson.Text - Data.Aeson.TH - Data.Aeson.Types - - other-modules: - Data.Aeson.Decoding.Conversion - Data.Aeson.Decoding.Internal - Data.Aeson.Encoding.Builder - Data.Aeson.Internal.ByteString - Data.Aeson.Internal.Functions - Data.Aeson.Internal.Prelude - Data.Aeson.Internal.Scientific - Data.Aeson.Internal.Text - Data.Aeson.Internal.TH - Data.Aeson.Internal.Unescape - Data.Aeson.Internal.UnescapeFromText - Data.Aeson.Parser.Time - Data.Aeson.Types.Class - Data.Aeson.Types.FromJSON - Data.Aeson.Types.Generic - Data.Aeson.Types.Internal - Data.Aeson.Types.ToJSON - - -- GHC bundled libs - build-depends: - , base >=4.12.0.0 && <5 - , bytestring >=0.10.8.2 && <0.13 - , containers >=0.6.0.1 && <0.8 - , deepseq >=1.4.4.0 && <1.6 - , exceptions >=0.10.4 && <0.11 - , ghc-prim >=0.5.0.0 && <0.12 - , template-haskell >=2.14.0.0 && <2.23 - , text >=1.2.3.0 && <1.3 || >=2.0 && <2.2 - , time >=1.8.0.2 && <1.13 - - -- Compat - build-depends: - , generically >=0.1 && <0.2 - , time-compat >=1.9.6 && <1.10 - - if !impl(ghc >=9.0) - build-depends: integer-gmp - - -- Other dependencies - build-depends: - , character-ps ^>=0.1 - , data-fix ^>=0.3.2 - , dlist ^>=1.0 - , hashable ^>=1.4.2.0 - , indexed-traversable ^>=0.1.2 - , integer-conversion ^>=0.1 - , integer-logarithms ^>=1.0.3.1 - , network-uri ^>=2.6.4.1 - , OneTuple ^>=0.4.1.1 - , primitive ^>=0.8.0.0 || ^>=0.9.0.0 - , QuickCheck ^>=2.14.3 || ^>=2.15 - , scientific ^>=0.3.7.0 - , semialign ^>=1.3 - , strict ^>=0.5 - , tagged ^>=0.8.7 - , text-iso8601 ^>=0.1.1 - , text-short ^>=0.1.5 - , th-abstraction ^>=0.5.0.0 || ^>=0.6.0.0 || ^>=0.7.0.0 - , these ^>=1.2 - , unordered-containers ^>=0.2.10.0 - , uuid-types ^>=1.0.5 - , vector ^>=0.13.0.0 - , witherable ^>=0.4.2 || ^>=0.5 - - ghc-options: -Wall - - -- String unescaping - - 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 - main-is: Tests.hs - ghc-options: -Wall -threaded -rtsopts - other-modules: - CastFloat - DataFamilies.Encoders - DataFamilies.Instances - DataFamilies.Properties - DataFamilies.Types - DoubleToScientific - Encoders - ErrorMessages - Functions - Instances - JSONTestSuite - Options - Properties - PropertyGeneric - PropertyKeys - PropertyQC - PropertyRoundTrip - PropertyRTFunctors - PropertyTH - PropUtils - Regression.Issue351 - Regression.Issue571 - Regression.Issue687 - Regression.Issue967 - RFC8785 - SerializationFormatSpec - Types - UnitTests - UnitTests.FromJSONKey - UnitTests.Hashable - UnitTests.KeyMapInsertWith - UnitTests.MonadFix - UnitTests.NoThunks - UnitTests.NullaryConstructors - UnitTests.OmitNothingFieldsNote - UnitTests.OptionalFields - UnitTests.OptionalFields.Common - UnitTests.OptionalFields.Generics - UnitTests.OptionalFields.Manual - UnitTests.OptionalFields.TH - UnitTests.UTCTime - - build-depends: - , aeson - , base - , base-compat - , base-orphans >=0.5.3 && <0.10 - , base16-bytestring - , bytestring - , containers - , data-fix - , deepseq - , Diff >=0.4 && <0.6 - , directory - , dlist - , filepath - , generic-deriving >=1.10 && <1.15 - , generically - , ghc-prim >=0.2 - , hashable - , indexed-traversable - , integer-logarithms >=1 && <1.1 - , network-uri - , OneTuple - , primitive - , QuickCheck >=2.14.2 && <2.16 - , 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 - - if !impl(ghc >=9.0) - build-depends: integer-gmp - - if impl(ghc >=9.2 && <9.7) - build-depends: nothunks >=0.1.4 && <0.3 - -source-repository head - type: git - location: git://github.com/haskell/aeson.git diff --git a/ghc-aeson.changes b/ghc-aeson.changes index d731f30..64cb7b3 100644 --- a/ghc-aeson.changes +++ b/ghc-aeson.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Jun 11 19:32:18 UTC 2024 - Peter Simons + +- Update aeson to version 2.2.3.0. + ### 2.2.3.0 + + * Support `hashable-1.4.6.0`. + * Fix an issue where `Hashable Key` wasn't newtype instance over underlying `Text`, + so with `-ordered-keymap` there were correctness issues. + * Add instances for `Data.Semigroup.Sum`, `Product`, `Any`, `All` + ------------------------------------------------------------------- Fri May 17 03:42:00 UTC 2024 - Peter Simons diff --git a/ghc-aeson.spec b/ghc-aeson.spec index b432a91..7b0f417 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -20,13 +20,12 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 2.2.2.0 +Version: 2.2.3.0 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/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-OneTuple-devel BuildRequires: ghc-OneTuple-prof @@ -159,7 +158,6 @@ This package provides the Haskell %{pkg_name} profiling library. %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build