From a02b34da7946b64a0976ee066456329d8d2db2d29342aafbeba6c7a1d355c69a Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Mon, 4 May 2015 18:21:44 +0000 Subject: [PATCH] Accepting request 304886 from devel:languages:haskell:lts - update to 0.8.0.2 * Fix ToJSON instance for 15-tuples. * Support time-1.5. * Add ToJSON and FromJSON instances for tuples of up to 15 elements. * Major compiler and library compatibility changes: we have dropped support for GHC older than 7.4, text older than 1.1, and bytestring older than 0.10.4.0. Supporting the older versions had become increasingly difficult, to the point where it was no longer worth it. * The performance of encoding to and decoding of bytestrings have both improved by up to 2x, while also using less memory. * New dependency: the scientific package lets us parse floating point numbers more quickly and accurately. * eitherDecode, decodeStrictWith: fixed bugs. * Added FromJSON and ToJSON instances for Tree and Scientific. * Fixed the ToJSON instances for UTCTime and ZonedTime. OBS-URL: https://build.opensuse.org/request/show/304886 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-aeson?expand=0&rev=8 --- _service | 3 -- aeson-0.6.2.0.tar.gz | 3 -- aeson-0.8.0.2.tar.gz | 3 ++ ghc-aeson.changes | 20 +++++++++++++ ghc-aeson.spec | 68 +++++++++++++++++++++++++++++++++++++------- 5 files changed, 81 insertions(+), 16 deletions(-) delete mode 100644 _service delete mode 100644 aeson-0.6.2.0.tar.gz create mode 100644 aeson-0.8.0.2.tar.gz diff --git a/_service b/_service deleted file mode 100644 index 1a837da..0000000 --- a/_service +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/aeson-0.6.2.0.tar.gz b/aeson-0.6.2.0.tar.gz deleted file mode 100644 index caadf7a..0000000 --- a/aeson-0.6.2.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:56117db2d94fae0a28e10b34048a98e4fb7660e7488dfcd251a5de44f9fbebb8 -size 110421 diff --git a/aeson-0.8.0.2.tar.gz b/aeson-0.8.0.2.tar.gz new file mode 100644 index 0000000..da1226d --- /dev/null +++ b/aeson-0.8.0.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0707588dfb5fdfe787eba5b3d5a9950acb224a8dae9dcdcfc9c974ae2b6788d5 +size 143850 diff --git a/ghc-aeson.changes b/ghc-aeson.changes index a6ab272..e14021e 100644 --- a/ghc-aeson.changes +++ b/ghc-aeson.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Wed Apr 22 10:47:20 UTC 2015 - mimi.vx@gmail.com + +- update to 0.8.0.2 +* Fix ToJSON instance for 15-tuples. +* Support time-1.5. +* Add ToJSON and FromJSON instances for tuples of up to 15 elements. +* Major compiler and library compatibility changes: we have dropped + support for GHC older than 7.4, text older than 1.1, and bytestring + older than 0.10.4.0. Supporting the older versions had become + increasingly difficult, to the point where it was no longer worth + it. +* The performance of encoding to and decoding of bytestrings have both + improved by up to 2x, while also using less memory. +* New dependency: the scientific package lets us parse floating point + numbers more quickly and accurately. +* eitherDecode, decodeStrictWith: fixed bugs. +* Added FromJSON and ToJSON instances for Tree and Scientific. +* Fixed the ToJSON instances for UTCTime and ZonedTime. + ------------------------------------------------------------------- Sun Nov 9 15:24:35 UTC 2014 - peter.trommler@ohm-hochschule.de diff --git a/ghc-aeson.spec b/ghc-aeson.spec index e422495..9d7059e 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-aeson # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,22 +18,23 @@ %global pkg_name aeson -Name: ghc-aeson -Version: 0.6.2.0 +%bcond_with tests + +Name: ghc-%{pkg_name} +Version: 0.8.0.2 Release: 0 Summary: Fast JSON parsing and encoding License: BSD-3-Clause Group: System/Libraries -Url: http://hackage.haskell.org/package/%{pkg_name} -Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz +Url: https://hackage.haskell.org/package/%{pkg_name} +Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-attoparsec-devel -BuildRequires: ghc-blaze-builder-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-deepseq-devel @@ -41,12 +42,20 @@ BuildRequires: ghc-dlist-devel BuildRequires: ghc-hashable-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-old-locale-devel +BuildRequires: ghc-scientific-devel BuildRequires: ghc-syb-devel BuildRequires: ghc-template-haskell-devel BuildRequires: ghc-text-devel BuildRequires: ghc-time-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel +%if %{with tests} +BuildRequires: ghc-HUnit-devel +BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-test-framework-devel +BuildRequires: ghc-test-framework-hunit-devel +BuildRequires: ghc-test-framework-quickcheck2-devel +%endif # End cabal-rpm deps %description @@ -55,8 +64,40 @@ performance. To get started, see the documentation for the 'Data.Aeson' module below. -For release notes, see -https://github.com/bos/aeson/blob/master/release-notes.markdown +Parsing performance on an early 2011 MacBook Pro (2.2GHz Core i7), running +64-bit GHC 7.6.3, for mostly-English tweets from Twitter's JSON search API: + +* 0.8 KB: 34124 msg/sec (27.8 MB/sec) + +* 6.4 KB: 6833 msg/sec (43.0 MB/sec) + +* 11.8 KB: 3410 msg/sec (39.2 MB/sec) + +* 31.2 KB: 1157 msg/sec (35.3 MB/sec) + +* 61.5 KB: 542 msg/sec (32.5 MB/sec) + +Handling heavily-escaped text is a little more work. Here is parsing +performance with Japanese tweets, where much of the text is entirely +Unicode-escaped. + +* 14.6 KB: 2101 msg/sec (30.0 MB/sec) + +* 44.1 KB: 667 msg/sec (28.7 MB/sec) + +* 82.9 KB: 360 msg/sec (29.2 MB/sec) + +Encoding performance on the same machine and data: + +* English, 0.8 KB: 109697 msg/sec (89.3 MB/sec) + +* English, 6.4 KB: 18517 msg/sec (116.4 MB/sec) + +* Engish, 61.5 KB: 1963 msg/sec (118.0 MB/sec) + +* Japanese, 14.6 KB: 12140 msg/sec (173.5 MB/sec) + +* Japanese, 44.1 KB: 3980 msg/sec (171.3 MB/sec) (A note on naming: in Greek mythology, Aeson was the father of Jason.). @@ -64,9 +105,10 @@ https://github.com/bos/aeson/blob/master/release-notes.markdown %package devel Summary: Haskell %{pkg_name} library development files Group: Development/Libraries/Other -Provides: %{name}-static = %{version}-%{release} -Requires: %{name} = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} +Requires(post): ghc-compiler = %{ghc_version} +Requires(postun): ghc-compiler = %{ghc_version} +Requires: %{name} = %{version}-%{release} %description devel This package provides the Haskell %{pkg_name} library development files. @@ -76,11 +118,17 @@ This package provides the Haskell %{pkg_name} library development files. %setup -q -n %{pkg_name}-%{version} %build +%define cabal_configure_options -f"old-time" %ghc_lib_build %install %ghc_lib_install +%check +%if %{with tests} +%cabal test +%endif + %post devel %ghc_pkg_recache