From 7be571c0aef9af22e959e1a0a0fbf10ffa7cbc7e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 8 Jun 2020 02:07:41 +0800 Subject: [PATCH] update to 1.3.0.0 --- .gitignore | 1 + ghc-hashable.spec | 7 +- ...le-1.2.7.0.cabal => hashable-1.3.0.0.cabal | 65 ++++++++++--------- sources | 2 +- 4 files changed, 41 insertions(+), 34 deletions(-) rename hashable-1.2.7.0.cabal => hashable-1.3.0.0.cabal (72%) diff --git a/.gitignore b/.gitignore index e9c7498..4ce0fcc 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /hashable-1.2.5.0.tar.gz /hashable-1.2.6.1.tar.gz /hashable-1.2.7.0.tar.gz +/hashable-1.3.0.0.tar.gz diff --git a/ghc-hashable.spec b/ghc-hashable.spec index a0eed1a..fb19abd 100644 --- a/ghc-hashable.spec +++ b/ghc-hashable.spec @@ -5,8 +5,8 @@ %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 1.2.7.0 -Release: 6%{?dist} +Version: 1.3.0.0 +Release: 1%{?dist} Summary: A class for types that can be converted to a hash value License: BSD @@ -117,6 +117,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Sun Jun 07 2020 Jens Petersen - 1.3.0.0-1 +- update to 1.3.0.0 + * Tue Jan 28 2020 Fedora Release Engineering - 1.2.7.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/hashable-1.2.7.0.cabal b/hashable-1.3.0.0.cabal similarity index 72% rename from hashable-1.2.7.0.cabal rename to hashable-1.3.0.0.cabal index ba026e7..a61f53d 100644 --- a/hashable-1.2.7.0.cabal +++ b/hashable-1.3.0.0.cabal @@ -1,6 +1,6 @@ Cabal-version: 1.12 Name: hashable -Version: 1.2.7.0 +Version: 1.3.0.0 x-revision: 1 Synopsis: A class for types that can be converted to a hash value Description: This package defines a class, 'Hashable', for types that @@ -9,6 +9,7 @@ Description: This package defines a class, 'Hashable', for types that structures. The package provides instances for basic types and a way to combine hash values. Homepage: http://github.com/tibbe/hashable +-- SPDX-License-Identifier : BSD-3-Clause License: BSD3 License-file: LICENSE Author: Milan Straka @@ -18,16 +19,13 @@ bug-reports: https://github.com/tibbe/hashable/issues Stability: Provisional Category: Data Build-type: Simple --- tests/Properties.hs shouldn't have to go here, but the source files --- for the test-suite stanzas don't get picked up by `cabal sdist`. -tested-with: GHC==8.4.1, GHC==8.2.2, GHC==8.0.2, GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2, GHC==7.2.2 +tested-with: GHC==8.10.1, GHC==8.8.3, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2, GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2 Extra-source-files: - CHANGES.md, README.md, tests/Properties.hs, - benchmarks/Benchmarks.hs, benchmarks/cbits/*.c, benchmarks/cbits/*.h + CHANGES.md, README.md Flag integer-gmp - Description: Are we using integer-gmp to provide fast Integer instances? + Description: Are we using @integer-gmp@ to provide fast Integer instances? Default: True Flag sse2 @@ -48,40 +46,47 @@ Flag examples Library Exposed-modules: Data.Hashable Data.Hashable.Lifted + Data.Hashable.Generic Other-modules: Data.Hashable.Class - Build-depends: base >= 4.4 && < 4.13, - bytestring >= 0.9 && < 0.11, - deepseq >= 1.3 && < 1.5 - if impl(ghc) - Build-depends: ghc-prim, - text >= 0.11.0.5 - if impl(ghc) && flag(integer-gmp) - Build-depends: integer-gmp >= 0.2 + Data.Hashable.Generic.Instances - if impl(ghc >= 7.2.1) - CPP-Options: -DGENERICS - Other-modules: Data.Hashable.Generic + C-sources: cbits/fnv.c - C-sources: - cbits/fnv.c + Build-depends: base >= 4.5 && < 4.15 + , bytestring >= 0.9 && < 0.11 + , deepseq >= 1.3 && < 1.5 + , text >= 0.12 && < 1.3 + , ghc-prim - Ghc-options: -Wall - if impl(ghc >= 6.8) - Ghc-options: -fwarn-tabs + if flag(integer-gmp) + Build-depends: integer-gmp >= 0.4 && < 1.1 else - c-sources: cbits/getRandomBytes.c - other-modules: Data.Hashable.RandomSource - if os(windows) - extra-libraries: advapi32 + -- this is needed for the automatic flag to be well-balanced + Build-depends: integer-simple Default-Language: Haskell2010 + Other-Extensions: BangPatterns + CPP + DeriveDataTypeable + FlexibleContexts + FlexibleInstances + GADTs + KindSignatures + MagicHash + MultiParamTypeClasses + ScopedTypeVariables + Trustworthy + TypeOperators + UnliftedFFITypes + + Ghc-options: -Wall -fwarn-tabs Test-suite tests Type: exitcode-stdio-1.0 Hs-source-dirs: tests Main-is: Main.hs Other-modules: Properties Regress - Build-depends: base >= 4.0 && < 5.0, + Build-depends: base, bytestring, ghc-prim, hashable, @@ -96,11 +101,9 @@ Test-suite tests Build-depends: unix CPP-options: -DHAVE_MMAP Other-modules: Regress.Mmap + Other-Extensions: CApiFFI Ghc-options: -Wall -fno-warn-orphans - if impl(ghc >= 7.2.1) - CPP-Options: -DGENERICS - Default-Language: Haskell2010 benchmark benchmarks diff --git a/sources b/sources index 9483298..7cef67b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hashable-1.2.7.0.tar.gz) = 41accac8fa38ab5c243caa058deaf31644d4df670520010d0d593e84fd42970f3fe2d4e945a31ac5491050467e843c7bdb299283a4c6d1446dfcbc2dbc58eec7 +SHA512 (hashable-1.3.0.0.tar.gz) = 2ba9b0657ddc6faf8b8be88e79d3c49503dfee3a446fc16bdc851f357afef1b92b443d1582d462cea859e37a16b46ec762b1dcf613458c5a15f800a8fccdb0ac