From 5d7331d14a0da9bf01a1a54750b46840c6521d26ba57b2033f04f868197681b9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Jul 2018 01:01:29 +0000 Subject: [PATCH 1/2] osc copypac from project:devel:languages:haskell:ghc-8.4.x package:ghc-aeson revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-aeson?expand=0&rev=40 --- aeson-1.2.4.0.tar.gz | 3 --- aeson-1.4.0.0.tar.gz | 3 +++ ghc-aeson.changes | 46 ++++++++++++++++++++++++++++++++++++++++++++ ghc-aeson.spec | 22 ++++----------------- 4 files changed, 53 insertions(+), 21 deletions(-) delete mode 100644 aeson-1.2.4.0.tar.gz create mode 100644 aeson-1.4.0.0.tar.gz diff --git a/aeson-1.2.4.0.tar.gz b/aeson-1.2.4.0.tar.gz deleted file mode 100644 index 3a35a21..0000000 --- a/aeson-1.2.4.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3401dba4fddb92c8a971f6645b38e2f8a1b286ef7061cd392a1a567640bbfc9b -size 265740 diff --git a/aeson-1.4.0.0.tar.gz b/aeson-1.4.0.0.tar.gz new file mode 100644 index 0000000..12d5439 --- /dev/null +++ b/aeson-1.4.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:916a208dbb2d46f4dda2d7162a9960e42b7b70526be4af06cd34cba526865710 +size 265216 diff --git a/ghc-aeson.changes b/ghc-aeson.changes index 65a88ce..a8f211f 100644 --- a/ghc-aeson.changes +++ b/ghc-aeson.changes @@ -1,3 +1,49 @@ +------------------------------------------------------------------- +Tue Jul 17 19:30:59 UTC 2018 - psimons@suse.com + +- Update aeson to version 1.4.0.0. + ### 1.4.0.0 + + This release introduces bounds on the size of `Scientific` numbers when they are converted to other arbitrary precision types that do not represent them efficiently in memory. + + This means that trying to decode a number such as `1e1000000000` into an `Integer` will now fail instead of using a lot of memory. If you need to represent large numbers you can add a newtype (preferably over `Scientific`) and providing a parser using `withScientific`. + + The following instances are affected by this: + * `FromJSON Natural` + * `FromJSONKey Natural` + * `FromJSON Integer` + * `FromJSONKey Integer` + * `FromJSON NominalDiffTime` + + For the same reasons the following instances & functions have been removed: + * Remove `FromJSON Data.Attoparsec.Number` instance. Note that `Data.Attoparsec.Number` is deprecated. + * Remove deprecated `withNumber`, use `withScientific` instead. + + Finally, encoding integral values with large exponents now uses scientific notation, this saves space for large numbers. + + ### 1.3.1.1 + + * Catch 0 denominators when parsing Ratio + + ### 1.3.1.0 + + * Fix bug in generically derived `FromJSON` instances that are using `unwrapUnaryRecords`, thanks to Xia Li-yao + * Allow base-compat 0.10.*, thanks to Oleg Grenrus + + ## 1.3.0.0 + + Breaking changes: + * `GKeyValue` has been renamed to `KeyValuePair`, thanks to Xia Li-yao + * Removed unused `FromJSON` constraint in `withEmbeddedJson`, thanks to Tristan Seligmann + + Other improvements: + * Optimizations of TH toEncoding, thanks to Xia Li-yao + * Optimizations of hex decoding when using the default/pure unescape implementation, thanks to Xia Li-yao + * Improved error message on `Day` parse failures, thanks to Gershom Bazerman + * Add `encodeFile` as well as `decodeFile*` variants, thanks to Markus Hauck + * Documentation fixes, thanks to Lennart Spitzner + * CPP cleanup, thanks to Ryan Scott + ------------------------------------------------------------------- Mon May 14 17:02:11 UTC 2018 - psimons@suse.com diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 98e3573..6e36d41 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -19,7 +19,7 @@ %global pkg_name aeson %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.2.4.0 +Version: 1.4.0.0 Release: 0 Summary: Fast JSON parsing and encoding License: BSD-3-Clause @@ -46,7 +46,6 @@ BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-uuid-types-devel BuildRequires: ghc-vector-devel %if %{with tests} -BuildRequires: ghc-HUnit-devel BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-base-orphans-devel BuildRequires: ghc-base16-bytestring-devel @@ -56,9 +55,9 @@ BuildRequires: ghc-generic-deriving-devel BuildRequires: ghc-hashable-time-devel BuildRequires: ghc-integer-logarithms-devel BuildRequires: ghc-quickcheck-instances-devel -BuildRequires: ghc-test-framework-devel -BuildRequires: ghc-test-framework-hunit-devel -BuildRequires: ghc-test-framework-quickcheck2-devel +BuildRequires: ghc-tasty-devel +BuildRequires: ghc-tasty-hunit-devel +BuildRequires: ghc-tasty-quickcheck-devel %endif %description @@ -67,19 +66,6 @@ performance. To get started, see the documentation for the 'Data.Aeson' module below. -Parsing performance on a late 2013 MacBook Pro (2.6GHz Core i7), running 64-bit -GHC 7.10.1, for mostly-English tweets from Twitter's JSON search API: - -* 6.4 KB payloads, English: 7570 msg/sec (47.6 MB/sec) - -* 14.6 KB payloads, Japanese: 3261 msg/sec (46.6 MB/sec) - -Encoding performance on the same machine and data: - -* 6.4 KB payloads, English: 22738 msg/sec (142.9 MB/sec) - -* 14.6 KB payloads, Japanese: 15911 msg/sec (227.4 MB/sec) - (A note on naming: in Greek mythology, Aeson was the father of Jason.). %package devel From 93e4993571440d64e47bf970d9f18596908e5f679433be118ba66ffc7cbb5fd2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Jul 2018 14:39:58 +0000 Subject: [PATCH 2/2] osc copypac from project:devel:languages:haskell:ghc-8.4.x package:ghc-aeson revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-aeson?expand=0&rev=41 --- ghc-aeson.changes | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/ghc-aeson.changes b/ghc-aeson.changes index a8f211f..7c6e853 100644 --- a/ghc-aeson.changes +++ b/ghc-aeson.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 18 14:26:12 UTC 2018 - psimons@suse.com + +- Cosmetic: replace tabs with blanks, strip trailing white space, + and update copyright headers with spec-cleaner. + ------------------------------------------------------------------- Tue Jul 17 19:30:59 UTC 2018 - psimons@suse.com @@ -41,7 +47,7 @@ Tue Jul 17 19:30:59 UTC 2018 - psimons@suse.com * Optimizations of hex decoding when using the default/pure unescape implementation, thanks to Xia Li-yao * Improved error message on `Day` parse failures, thanks to Gershom Bazerman * Add `encodeFile` as well as `decodeFile*` variants, thanks to Markus Hauck - * Documentation fixes, thanks to Lennart Spitzner + * Documentation fixes, thanks to Lennart Spitzner * CPP cleanup, thanks to Ryan Scott ------------------------------------------------------------------- @@ -140,20 +146,20 @@ Fri Mar 25 07:41:45 UTC 2016 - mimi.vx@gmail.com FromJSON Natural * This release should be close to backwards compatible with aeson 0.9 (0.11.0.0) + Breaking changes: - Revert .:? to behave like it did in 0.9. If you want the 0.10 behavior + Revert .:? to behave like it did in 0.9. If you want the 0.10 behavior use .:! instead. - Revert JSON format of Either to 0.9, Left and Right are now serialized with - an initial uppercase letter. If you want the names in lowercase you can + Revert JSON format of Either to 0.9, Left and Right are now serialized with + an initial uppercase letter. If you want the names in lowercase you can add a newtype with an instance. All ToJSON and FromJSON instances except for [a] are no longer OVERLAPPABLE. - Mark your instance as OVERLAPPING if it overlaps any of the other aeson + Mark your instance as OVERLAPPING if it overlaps any of the other aeson instances. - All ToJSON and FromJSON instances except for [Char] are no longer + All ToJSON and FromJSON instances except for [Char] are no longer incoherent, this means you may need to replace your incoherent instances with a newtyped instance. + Additions: Introduce .:! that behaves like .:? did in 0.10. - Allow HH:MM format for ZonedTime and UTCTime. This is one of the formats + Allow HH:MM format for ZonedTime and UTCTime. This is one of the formats allowed by ISO 8601. Added ToJSON and FromJSON instances for the Version, Ordering, and Natural types. @@ -172,9 +178,9 @@ Mon Sep 28 18:42:15 UTC 2015 - mimi.vx@gmail.com * The json and json' parsers are now synonyms for value and value', in conformance with the looser semantics of RFC 7159. * Renamed encodeToByteStringBuilder to the more compact encodeToBuilder. -* The dependency on the unordered-containers package was too lax, and has been +* The dependency on the unordered-containers package was too lax, and has been corrected. -* Encoding a Scientific value with a huge exponent is now handled efficiently. +* Encoding a Scientific value with a huge exponent is now handled efficiently. (This would previously allocate a huge arbitrary-precision integer, potentially leading to a denial of service.) * Handling of strings that contain backslash escape sequences is greatly improved. @@ -212,13 +218,13 @@ Wed Apr 22 10:47:20 UTC 2015 - mimi.vx@gmail.com Sun Nov 9 15:24:35 UTC 2014 - peter.trommler@ohm-hochschule.de - drop aeson-disable-TH.patch -* Template Haskell (TH) now available on all supprted archs +* Template Haskell (TH) now available on all supprted archs ------------------------------------------------------------------- Sat Oct 18 14:50:27 UTC 2014 - dvaleev@suse.com - disable TH module on arch's without ghci - aeson-disable-TH.patch + aeson-disable-TH.patch ------------------------------------------------------------------- Mon Oct 28 19:50:03 UTC 2013 - sbahling@suse.com @@ -228,5 +234,4 @@ Mon Oct 28 19:50:03 UTC 2013 - sbahling@suse.com ------------------------------------------------------------------- Mon Oct 7 13:35:59 UTC 2013 - sbahling@suse.com -- Initial package - version 0.6.2.0 - +- Initial package - version 0.6.2.0