From f9d1cf37b13970b61481057c62049fe50caba31a6ec0e7a1ae589c8e59db05f1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 13 Aug 2018 01:01:25 +0000 Subject: [PATCH 1/2] osc copypac from project:devel:languages:haskell:ghc-8.4.x package:ghc-hashable revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hashable?expand=0&rev=41 --- ghc-hashable.spec | 2 + hashable.cabal | 180 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 182 insertions(+) create mode 100644 hashable.cabal diff --git a/ghc-hashable.spec b/ghc-hashable.spec index ef178ec..87b6644 100644 --- a/ghc-hashable.spec +++ b/ghc-hashable.spec @@ -26,6 +26,7 @@ License: BSD-3-Clause Group: Development/Libraries/Haskell 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: ghc-Cabal-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-deepseq-devel @@ -60,6 +61,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ifarch i586 diff --git a/hashable.cabal b/hashable.cabal new file mode 100644 index 0000000..b09e9e0 --- /dev/null +++ b/hashable.cabal @@ -0,0 +1,180 @@ +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 From 059705a9b17f60212d1165652a1e0b6adda3d37085b9eefdc60a238ffc0a37da Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 19 Aug 2018 07:09:01 +0000 Subject: [PATCH 2/2] osc copypac from project:devel:languages:haskell:ghc-8.4.x package:ghc-hashable revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hashable?expand=0&rev=42 --- ghc-hashable.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ghc-hashable.changes b/ghc-hashable.changes index c40aa88..cf0a7e2 100644 --- a/ghc-hashable.changes +++ b/ghc-hashable.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Aug 17 14:30:43 UTC 2018 - psimons@suse.com + +- Update Cabal build information to support GHC 8.6.x. + ------------------------------------------------------------------- Wed Jul 18 14:26:26 UTC 2018 - psimons@suse.com