From 861b3e4dd4ef78d630343f4e112eb54362aa9542b604a8291ea2b1cbefc0e1e2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Mar 2017 10:58:04 +0000 Subject: [PATCH] synchronize with lts:8 from configuration b099e9d7d96777a669f3ad2cb719ba73f50b4189 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hashable?expand=0&rev=19 --- ghc-hashable.changes | 5 ++ ghc-hashable.spec | 5 +- hashable-1.2.5.0.tar.gz | 3 - hashable-1.2.6.0.tar.gz | 3 + hashable.cabal | 172 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 184 insertions(+), 4 deletions(-) delete mode 100644 hashable-1.2.5.0.tar.gz create mode 100644 hashable-1.2.6.0.tar.gz create mode 100644 hashable.cabal diff --git a/ghc-hashable.changes b/ghc-hashable.changes index 64a46bc..108bbe1 100644 --- a/ghc-hashable.changes +++ b/ghc-hashable.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 27 12:41:05 UTC 2017 - psimons@suse.com + +- Update to version 1.2.6.0 revision 1 with cabal2obs. + ------------------------------------------------------------------- Sun Feb 12 14:20:09 UTC 2017 - psimons@suse.com diff --git a/ghc-hashable.spec b/ghc-hashable.spec index c6b28aa..b41c7de 100644 --- a/ghc-hashable.spec +++ b/ghc-hashable.spec @@ -19,15 +19,17 @@ %global pkg_name hashable %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.2.5.0 +Version: 1.2.6.0 Release: 0 Summary: A class for types that can be converted to a hash value License: BSD-3-Clause Group: Development/Languages/Other 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 BuildRequires: ghc-rpm-macros BuildRequires: ghc-text-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -60,6 +62,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-1.2.5.0.tar.gz b/hashable-1.2.5.0.tar.gz deleted file mode 100644 index f1a411b..0000000 --- a/hashable-1.2.5.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:153eb1614a739f3ccf8c5fcd4230a17b8b24862ab727c46dd4acd22bc15fb2bc -size 29247 diff --git a/hashable-1.2.6.0.tar.gz b/hashable-1.2.6.0.tar.gz new file mode 100644 index 0000000..201e80c --- /dev/null +++ b/hashable-1.2.6.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:429b663c827af52f64b0f376ee6e7a990e57ec54a59107857311054ade6e0a52 +size 29587 diff --git a/hashable.cabal b/hashable.cabal new file mode 100644 index 0000000..11d3dc2 --- /dev/null +++ b/hashable.cabal @@ -0,0 +1,172 @@ +Name: hashable +Version: 1.2.6.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 +Cabal-version: >=1.8 +-- 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`. +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.11, + bytestring >= 0.9 && < 0.11, + deepseq >= 1.3 + 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 + +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 + +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 + + +Executable hashable-examples + if flag(examples) + build-depends: base, hashable + else + buildable: False + hs-source-dirs: examples + main-is: Main.hs + +source-repository head + type: git + location: https://github.com/tibbe/hashable.git