From c55e617bb1ae7a7b96d87f3b543bd4229b276a74224fd244ee287522374dbb7a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:03:23 +0000 Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-hashable revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hashable?expand=0&rev=64 --- ghc-hashable.changes | 30 ---- ghc-hashable.spec | 6 +- hashable-1.2.7.0.tar.gz | 3 + hashable-1.3.0.0.tar.gz | 3 - hashable.cabal | 363 ++++++++++++++++++++-------------------- 5 files changed, 186 insertions(+), 219 deletions(-) create mode 100644 hashable-1.2.7.0.tar.gz delete mode 100644 hashable-1.3.0.0.tar.gz diff --git a/ghc-hashable.changes b/ghc-hashable.changes index 35163c5..a362bb7 100644 --- a/ghc-hashable.changes +++ b/ghc-hashable.changes @@ -1,33 +1,3 @@ -------------------------------------------------------------------- -Mon Aug 31 09:34:36 UTC 2020 - psimons@suse.com - -- Update hashable to version 1.3.0.0 revision 1. - Upstream has revised the Cabal build instructions on Hackage. - -------------------------------------------------------------------- -Tue Aug 18 10:44:58 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Tue Jun 16 11:14:09 UTC 2020 - Peter Simons - -- Re-generate file with latest version of spec-cleaner. - -------------------------------------------------------------------- -Thu May 7 08:08:20 UTC 2020 - Peter Simons - -- Update Cabal file to get more accurate dependency information. - -------------------------------------------------------------------- -Sun Dec 29 10:27:18 UTC 2019 - psimons@suse.com - -- Update hashable to version 1.3.0.0. - Upstream has edited the change log file since the last release in - a non-trivial way, i.e. they did more than just add a new entry - at the top. You can review the file at: - http://hackage.haskell.org/package/hashable-1.3.0.0/src/CHANGES.md - ------------------------------------------------------------------- Fri Nov 8 16:13:49 UTC 2019 - Peter Simons diff --git a/ghc-hashable.spec b/ghc-hashable.spec index 1ef8e3a..35943e6 100644 --- a/ghc-hashable.spec +++ b/ghc-hashable.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-hashable # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2019 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 @@ -19,7 +19,7 @@ %global pkg_name hashable %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.3.0.0 +Version: 1.2.7.0 Release: 0 Summary: A class for types that can be converted to a hash value License: BSD-3-Clause @@ -58,7 +58,7 @@ Requires(postun): ghc-compiler = %{ghc_version} This package provides the Haskell %{pkg_name} library development files. %prep -%autosetup -n %{pkg_name}-%{version} +%setup -q -n %{pkg_name}-%{version} cp -p %{SOURCE1} %{pkg_name}.cabal %build diff --git a/hashable-1.2.7.0.tar.gz b/hashable-1.2.7.0.tar.gz new file mode 100644 index 0000000..d19aea5 --- /dev/null +++ b/hashable-1.2.7.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ecb5efc0586023f5a0dc861100621c1dbb4cbb2f0516829a16ebac39f0432abf +size 30182 diff --git a/hashable-1.3.0.0.tar.gz b/hashable-1.3.0.0.tar.gz deleted file mode 100644 index a4cf5ea..0000000 --- a/hashable-1.3.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:822e5413fbccca6ae884d3aba4066422c8b5d58d23d18b9ecb5c03273bb19ab4 -size 29835 diff --git a/hashable.cabal b/hashable.cabal index 76aff02..b09e9e0 100644 --- a/hashable.cabal +++ b/hashable.cabal @@ -1,183 +1,180 @@ -Cabal-version: 1.12 -Name: hashable -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 - can be converted to a hash value. This class - exists for the benefit of hashing-based data - 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 - Johan Tibell -Maintainer: johan.tibell@gmail.com -bug-reports: https://github.com/tibbe/hashable/issues -Stability: Provisional -Category: Data -Build-type: Simple -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 - -Flag integer-gmp - Description: Are we using @integer-gmp@ to provide fast Integer instances? - Default: True - -Flag sse2 - Description: Do we want to assume that a target supports SSE 2? - Default: True - Manual: True - -Flag sse41 - Description: Do we want to assume that a target supports SSE 4.1? - Default: False - Manual: True - -Flag examples - Description: Build example modules - Default: False - Manual: True - -Library - Exposed-modules: Data.Hashable - Data.Hashable.Lifted - Data.Hashable.Generic - Other-modules: Data.Hashable.Class - Data.Hashable.Generic.Instances - - 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 - - if flag(integer-gmp) - Build-depends: integer-gmp >= 0.4 && < 1.1 - else - -- 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, - bytestring, - ghc-prim, - hashable, - test-framework >= 0.3.3, - test-framework-hunit, - test-framework-quickcheck2 >= 0.2.9, - HUnit, - QuickCheck >= 2.4.0.1, - random >= 1.0 && < 1.2, - text >= 0.11.0.5 - if !os(windows) - Build-depends: unix - CPP-options: -DHAVE_MMAP - Other-modules: Regress.Mmap - Other-Extensions: CApiFFI - - Ghc-options: -Wall -fno-warn-orphans - Default-Language: Haskell2010 - -benchmark benchmarks - -- We cannot depend on the hashable library directly as that creates - -- a dependency cycle. - hs-source-dirs: . benchmarks - - main-is: Benchmarks.hs - other-modules: - Data.Hashable - Data.Hashable.Class - Data.Hashable.RandomSource - Data.Hashable.SipHash - type: exitcode-stdio-1.0 - - build-depends: - base, - bytestring, - criterion >= 1.0, - ghc-prim, - siphash, - text - - if impl(ghc) - Build-depends: ghc-prim, - text >= 0.11.0.5 - if impl(ghc) && flag(integer-gmp) - Build-depends: integer-gmp >= 0.2 - - if impl(ghc >= 7.2.1) - CPP-Options: -DGENERICS - - include-dirs: - benchmarks/cbits - - includes: - siphash.h - - c-sources: - benchmarks/cbits/inthash.c - benchmarks/cbits/siphash.c - benchmarks/cbits/wang.c - cbits/fnv.c - - if (arch(i386) || arch(x86_64)) && flag(sse2) - cpp-options: -DHAVE_SSE2 - c-sources: - benchmarks/cbits/siphash-sse2.c - - if flag(sse41) - cpp-options: -DHAVE_SSE41 - c-sources: - benchmarks/cbits/siphash-sse41.c - - Ghc-options: -Wall -O2 - if impl(ghc >= 6.8) - Ghc-options: -fwarn-tabs - else - c-sources: cbits/getRandomBytes.c - other-modules: Data.Hashable.RandomSource - if os(windows) - extra-libraries: advapi32 - - Default-Language: Haskell2010 - -Executable hashable-examples - if flag(examples) - build-depends: base, hashable - else - buildable: False - hs-source-dirs: examples - main-is: Main.hs - Default-Language: Haskell2010 - -source-repository head - type: git - location: https://github.com/tibbe/hashable.git +Cabal-version: 1.12 +Name: hashable +Version: 1.2.7.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 + can be converted to a hash value. This class + exists for the benefit of hashing-based data + structures. The package provides instances for + basic types and a way to combine hash values. +Homepage: http://github.com/tibbe/hashable +License: BSD3 +License-file: LICENSE +Author: Milan Straka + Johan Tibell +Maintainer: johan.tibell@gmail.com +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 + +Extra-source-files: + CHANGES.md, README.md, tests/Properties.hs, + benchmarks/Benchmarks.hs, benchmarks/cbits/*.c, benchmarks/cbits/*.h + +Flag integer-gmp + Description: Are we using integer-gmp to provide fast Integer instances? + Default: True + +Flag sse2 + Description: Do we want to assume that a target supports SSE 2? + Default: True + Manual: True + +Flag sse41 + Description: Do we want to assume that a target supports SSE 4.1? + Default: False + Manual: True + +Flag examples + Description: Build example modules + Default: False + Manual: True + +Library + Exposed-modules: Data.Hashable + Data.Hashable.Lifted + 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 + + if impl(ghc >= 7.2.1) + CPP-Options: -DGENERICS + Other-modules: Data.Hashable.Generic + + C-sources: + cbits/fnv.c + + Ghc-options: -Wall + if impl(ghc >= 6.8) + Ghc-options: -fwarn-tabs + else + c-sources: cbits/getRandomBytes.c + other-modules: Data.Hashable.RandomSource + if os(windows) + extra-libraries: advapi32 + + Default-Language: Haskell2010 + +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, + bytestring, + ghc-prim, + hashable, + test-framework >= 0.3.3, + test-framework-hunit, + test-framework-quickcheck2 >= 0.2.9, + HUnit, + QuickCheck >= 2.4.0.1, + random >= 1.0 && < 1.2, + text >= 0.11.0.5 + if !os(windows) + Build-depends: unix + CPP-options: -DHAVE_MMAP + Other-modules: Regress.Mmap + + Ghc-options: -Wall -fno-warn-orphans + if impl(ghc >= 7.2.1) + CPP-Options: -DGENERICS + + Default-Language: Haskell2010 + +benchmark benchmarks + -- We cannot depend on the hashable library directly as that creates + -- a dependency cycle. + hs-source-dirs: . benchmarks + + main-is: Benchmarks.hs + other-modules: + Data.Hashable + Data.Hashable.Class + Data.Hashable.RandomSource + Data.Hashable.SipHash + type: exitcode-stdio-1.0 + + build-depends: + base, + bytestring, + criterion >= 1.0, + ghc-prim, + siphash, + text + + if impl(ghc) + Build-depends: ghc-prim, + text >= 0.11.0.5 + if impl(ghc) && flag(integer-gmp) + Build-depends: integer-gmp >= 0.2 + + if impl(ghc >= 7.2.1) + CPP-Options: -DGENERICS + + include-dirs: + benchmarks/cbits + + includes: + siphash.h + + c-sources: + benchmarks/cbits/inthash.c + benchmarks/cbits/siphash.c + benchmarks/cbits/wang.c + cbits/fnv.c + + if (arch(i386) || arch(x86_64)) && flag(sse2) + cpp-options: -DHAVE_SSE2 + c-sources: + benchmarks/cbits/siphash-sse2.c + + if flag(sse41) + cpp-options: -DHAVE_SSE41 + c-sources: + benchmarks/cbits/siphash-sse41.c + + Ghc-options: -Wall -O2 + if impl(ghc >= 6.8) + Ghc-options: -fwarn-tabs + else + c-sources: cbits/getRandomBytes.c + other-modules: Data.Hashable.RandomSource + if os(windows) + extra-libraries: advapi32 + + Default-Language: Haskell2010 + +Executable hashable-examples + if flag(examples) + build-depends: base, hashable + else + buildable: False + hs-source-dirs: examples + main-is: Main.hs + Default-Language: Haskell2010 + +source-repository head + type: git + location: https://github.com/tibbe/hashable.git