Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-criterion for openSUSE:Factory checked in at 2021-11-11 21:36:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-criterion (Old) and /work/SRC/openSUSE:Factory/.ghc-criterion.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-criterion" Thu Nov 11 21:36:22 2021 rev:3 rq:930320 version:1.5.11.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-criterion/ghc-criterion.changes 2021-09-09 23:07:58.996861536 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-criterion.new.1890/ghc-criterion.changes 2021-11-11 21:36:31.764893351 +0100 @@ -1,0 +2,8 @@ +Sun Oct 10 14:17:07 UTC 2021 - [email protected] + +- Update criterion to version 1.5.11.0. + 1.5.11.0 + + * Allow building with `aeson-2.0.0.0`. + +------------------------------------------------------------------- Old: ---- criterion-1.5.10.0.tar.gz criterion.cabal New: ---- criterion-1.5.11.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-criterion.spec ++++++ --- /var/tmp/diff_new_pack.tO9L2q/_old 2021-11-11 21:36:32.188893661 +0100 +++ /var/tmp/diff_new_pack.tO9L2q/_new 2021-11-11 21:36:32.188893661 +0100 @@ -19,13 +19,12 @@ %global pkg_name criterion %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.5.10.0 +Version: 1.5.11.0 Release: 0 Summary: Robust, reliable performance measurement and analysis License: BSD-2-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: chrpath BuildRequires: ghc-Cabal-devel BuildRequires: ghc-Glob-devel @@ -92,7 +91,6 @@ %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ criterion-1.5.10.0.tar.gz -> criterion-1.5.11.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/criterion-1.5.10.0/Criterion/Report.hs new/criterion-1.5.11.0/Criterion/Report.hs --- old/criterion-1.5.10.0/Criterion/Report.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/criterion-1.5.11.0/Criterion/Report.hs 2001-09-09 03:46:40.000000000 +0200 @@ -70,6 +70,10 @@ import qualified Language.Javascript.Chart as Chart #endif +#if MIN_VERSION_aeson(2,0,0) +import qualified Data.Aeson.Key as Key +#endif + -- | Trim long flat tails from a KDE plot. tidyTails :: KDE -> KDE tidyTails KDE{..} = KDE { kdeType = kdeType @@ -214,7 +218,8 @@ -> Value {-# SPECIALIZE vector :: T.Text -> U.Vector Double -> Value #-} vector name v = toJSON . map val . G.toList $ v where - val i = object [ name .= i ] + val i = object [ toKey name .= i ] + -- | Render the elements of two vectors. vector2 :: (G.Vector v a, G.Vector v b, ToJSON a, ToJSON b) => @@ -227,10 +232,19 @@ -> Value #-} vector2 name1 name2 v1 v2 = toJSON $ zipWith val (G.toList v1) (G.toList v2) where val i j = object - [ name1 .= i - , name2 .= j + [ toKey name1 .= i + , toKey name2 .= j ] +#if MIN_VERSION_aeson(2,0,0) +toKey :: T.Text -> Key.Key +toKey = Key.fromText +#else +toKey :: T.Text -> T.Text +toKey = id +#endif + + -- | Attempt to include the contents of a file based on a search path. -- Returns 'B.empty' if the search fails or the file could not be read. -- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/criterion-1.5.10.0/changelog.md new/criterion-1.5.11.0/changelog.md --- old/criterion-1.5.10.0/changelog.md 2001-09-09 03:46:40.000000000 +0200 +++ new/criterion-1.5.11.0/changelog.md 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,7 @@ +1.5.11.0 + +* Allow building with `aeson-2.0.0.0`. + 1.5.10.0 * Fix a bug in which the `defaultMainWith` function would not use the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/criterion-1.5.10.0/criterion.cabal new/criterion-1.5.11.0/criterion.cabal --- old/criterion-1.5.10.0/criterion.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/criterion-1.5.11.0/criterion.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,5 @@ name: criterion -version: 1.5.10.0 +version: 1.5.11.0 synopsis: Robust, reliable performance measurement and analysis license: BSD3 license-file: LICENSE @@ -80,10 +80,12 @@ Paths_criterion build-depends: - aeson >= 1, + -- TODO: Eventually, we should bump the lower version bounds to >=2 so that + -- we can remove some CPP in Criterion.Report. See #247. + aeson >= 1 && < 2.1, ansi-wl-pprint >= 0.6.7.2, base >= 4.5 && < 5, - base-compat-batteries >= 0.10 && < 0.12, + base-compat-batteries >= 0.10 && < 0.13, binary >= 0.5.1.0, binary-orphans >= 1.0.1 && < 1.1, bytestring >= 0.9 && < 1.0, @@ -195,7 +197,7 @@ tasty-hunit, tasty-quickcheck, vector, - aeson >= 0.8 + aeson test-suite cleanup type: exitcode-stdio-1.0
