From 96a88934f8597c9ec3754481a849f65f8043cb80 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 24 Jul 2023 19:25:32 +0800 Subject: [PATCH] update to 0.13.0.0 - add vector-stream --- .gitignore | 2 + ghc-vector.spec | 61 +++++---- sources | 3 +- ...or-0.12.3.1.cabal => vector-0.13.0.0.cabal | 125 +++++++++++------- 4 files changed, 117 insertions(+), 74 deletions(-) rename vector-0.12.3.1.cabal => vector-0.13.0.0.cabal (73%) diff --git a/.gitignore b/.gitignore index 01c2a8b..3c26e21 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ /vector-0.12.1.2.tar.gz /vector-0.12.3.0.tar.gz /vector-0.12.3.1.tar.gz +/vector-0.13.0.0.tar.gz +/vector-stream-0.1.0.0.tar.gz diff --git a/ghc-vector.spec b/ghc-vector.spec index 7c0f0ba..09a030c 100644 --- a/ghc-vector.spec +++ b/ghc-vector.spec @@ -1,47 +1,40 @@ -# generated by cabal-rpm-2.1.0 +# generated by cabal-rpm-2.1.2 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name vector %global pkgver %{pkg_name}-%{version} -# testsuite seems to hang -%bcond_with tests +%global vectorstream vector-stream-0.1.0.0 +%global subpkgs %{vectorstream} + +# testsuite missing deps: tasty-inspection-testing Name: ghc-%{pkg_name} -Version: 0.12.3.1 -Release: 5%{?dist} +Version: 0.13.0.0 +Release: 1%{?dist} Summary: Efficient Arrays License: BSD-3-Clause Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal +Source1: https://hackage.haskell.org/package/%{vectorstream}/%{vectorstream}.tar.gz +Source2: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources # Begin cabal-rpm deps: BuildRequires: dos2unix BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra BuildRequires: ghc-base-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-primitive-devel +#BuildRequires: ghc-vector-stream-devel %if %{with ghc_prof} BuildRequires: ghc-base-prof BuildRequires: ghc-deepseq-prof BuildRequires: ghc-primitive-prof -%endif -%if %{with tests} -BuildRequires: ghc-HUnit-devel -BuildRequires: ghc-QuickCheck-devel -BuildRequires: ghc-base-orphans-devel -BuildRequires: ghc-doctest-devel -BuildRequires: ghc-random-devel -BuildRequires: ghc-tasty-devel -BuildRequires: ghc-tasty-hunit-devel -BuildRequires: ghc-tasty-quickcheck-devel -BuildRequires: ghc-template-haskell-devel -BuildRequires: ghc-transformers-devel +#BuildRequires: ghc-vector-stream-prof %endif # End cabal-rpm deps @@ -85,31 +78,41 @@ This package provides the Haskell %{pkg_name} profiling library. %endif +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage %{vectorstream} +%endif + +%global version %{main_version} + + %prep # Begin cabal-rpm setup: -%setup -q -n %{pkgver} -dos2unix -k -n %{SOURCE1} %{pkg_name}.cabal +%setup -q -n %{pkgver} -a1 +dos2unix -k -n %{SOURCE2} %{pkg_name}.cabal # End cabal-rpm setup +( +cd %{vectorstream} +cabal-tweak-dep-ver base '< 4.17' '< 4.18' +cabal-tweak-dep-ver ghc-prim '< 0.9' '< 0.10' +) %build # Begin cabal-rpm build: +%ghc_libs_build %{subpkgs} %ghc_lib_build # End cabal-rpm build %install # Begin cabal-rpm install +%ghc_libs_install %{subpkgs} %ghc_lib_install # End cabal-rpm install -%check -%if %{with tests} -%cabal_test -%endif - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -132,6 +135,10 @@ dos2unix -k -n %{SOURCE1} %{pkg_name}.cabal %changelog +* Mon Jul 24 2023 Jens Petersen - 0.13.0.0-1 +- https://hackage.haskell.org/package/vector-0.13.0.0/changelog +- add vector-stream + * Wed Jul 19 2023 Fedora Release Engineering - 0.12.3.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 28006a4..6be0a89 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (vector-0.12.3.1.tar.gz) = bf117d53c7844c010dc1cee8b778851bd714155fd34e671ae2eb7bd324427de972389eb9f3f315832f20e7bbbecc93ec0f6296ab10e4935957d2a4e14c6cfd98 +SHA512 (vector-0.13.0.0.tar.gz) = aadb33cb1acf3cc634631fbf6a8764fb92514a43c17395e305c9fcc91e0768ce51cec30c542a9ba998bf90e297732082ef5dbbf74232c885d613ac0fb7bcd2e1 +SHA512 (vector-stream-0.1.0.0.tar.gz) = ff9a404e6b310c0dc599e0f0a099e2e7b3af90e2866877d5fffd7c8245a0a671da450e299fa1b273782310a88736219627384e1d5e62f3c003351750ed848c60 diff --git a/vector-0.12.3.1.cabal b/vector-0.13.0.0.cabal similarity index 73% rename from vector-0.12.3.1.cabal rename to vector-0.13.0.0.cabal index f75e095..e228886 100644 --- a/vector-0.12.3.1.cabal +++ b/vector-0.13.0.0.cabal @@ -1,19 +1,23 @@ Name: vector -Version: 0.12.3.1 -x-revision: 2 +Version: 0.13.0.0 +x-revision: 3 -- don't forget to update the changelog file! License: BSD3 License-File: LICENSE Author: Roman Leshchinskiy Maintainer: Haskell Libraries Team -Copyright: (c) Roman Leshchinskiy 2008-2012 +Copyright: (c) Roman Leshchinskiy 2008-2012, + Alexey Kuleshevich 2020-2022, + Aleksey Khudyakov 2020-2022, + Andrew Lelechenko 2020-2022 + Homepage: https://github.com/haskell/vector Bug-Reports: https://github.com/haskell/vector/issues Category: Data, Data Structures Synopsis: Efficient Arrays Description: . - An efficient implementation of Int-indexed arrays (both mutable + An efficient implementation of @Int@-indexed arrays (both mutable and immutable), with a powerful loop optimisation framework . . It is structured as follows: @@ -36,19 +40,16 @@ Description: * Tested-With: - GHC == 7.4.2, - GHC == 7.6.3, - GHC == 7.8.4, - GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, - GHC == 8.8.1, - GHC == 8.10.1 + GHC == 8.8.4, + GHC == 8.10.7, + GHC == 9.0.1, + GHC == 9.2.3 - -Cabal-Version: >=1.10 +Cabal-Version: >= 1.10 Build-Type: Simple Extra-Source-Files: @@ -57,26 +58,9 @@ Extra-Source-Files: tests/LICENSE tests/Setup.hs tests/Main.hs - benchmarks/vector-benchmarks.cabal - benchmarks/LICENSE - benchmarks/Setup.hs - benchmarks/Main.hs - benchmarks/Algo/AwShCC.hs - benchmarks/Algo/HybCC.hs - benchmarks/Algo/Leaffix.hs - benchmarks/Algo/ListRank.hs - benchmarks/Algo/Quickhull.hs - benchmarks/Algo/Rootfix.hs - benchmarks/Algo/Spectral.hs - benchmarks/Algo/Tridiag.hs - benchmarks/TestData/Graph.hs - benchmarks/TestData/ParenTree.hs - benchmarks/TestData/Random.hs internal/GenUnboxTuple.hs internal/unbox-tuple-instances - - Flag BoundsChecks Description: Enable bounds checking Default: True @@ -113,7 +97,7 @@ Library KindSignatures MagicHash MultiParamTypeClasses - Rank2Types + RankNTypes ScopedTypeVariables StandaloneDeriving TypeFamilies @@ -147,19 +131,19 @@ Library Data.Vector.Mutable Data.Vector + Hs-Source-Dirs: + src + Include-Dirs: include, internal Install-Includes: vector.h - Build-Depends: base >= 4.5 && < 4.18 - , primitive >= 0.6.4.0 && < 0.8 - , ghc-prim >= 0.2 && < 0.10 + Build-Depends: base >= 4.9 && < 4.19 + , primitive >= 0.6.4.0 && < 0.9 , deepseq >= 1.1 && < 1.5 - if !impl(ghc > 8.0) - Build-Depends: fail == 4.9.* - , semigroups >= 0.18 && < 0.21 + , vector-stream >= 0.1 && < 0.2 Ghc-Options: -O2 -Wall @@ -181,7 +165,7 @@ Library source-repository head type: git location: https://github.com/haskell/vector.git - + subdir: vector test-suite vector-tests-O0 @@ -207,15 +191,13 @@ test-suite vector-tests-O0 QuickCheck >= 2.9 && < 2.15, HUnit, tasty, tasty-hunit, tasty-quickcheck, transformers >= 0.2.0.0 - if !impl(ghc > 8.0) - Build-Depends: semigroups default-extensions: CPP, ScopedTypeVariables, PatternGuards, MultiParamTypeClasses, FlexibleContexts, - Rank2Types, + RankNTypes, TypeSynonymInstances, TypeFamilies, TemplateHaskell @@ -225,7 +207,7 @@ test-suite vector-tests-O0 if !flag(Wall) Ghc-Options: -fno-warn-orphans -fno-warn-missing-signatures - if impl(ghc >= 8.0) && impl( ghc < 8.1) + if impl(ghc >= 8.0) && impl(ghc < 8.1) Ghc-Options: -Wno-redundant-constraints @@ -252,20 +234,17 @@ test-suite vector-tests-O2 QuickCheck >= 2.9 && < 2.15, HUnit, tasty, tasty-hunit, tasty-quickcheck, transformers >= 0.2.0.0 - if !impl(ghc > 8.0) - Build-Depends: semigroups default-extensions: CPP, ScopedTypeVariables, PatternGuards, MultiParamTypeClasses, FlexibleContexts, - Rank2Types, + RankNTypes, TypeSynonymInstances, TypeFamilies, TemplateHaskell - Ghc-Options: -Wall Ghc-Options: -O2 -threaded if !flag(Wall) @@ -284,8 +263,62 @@ test-suite vector-doctest -- GHC 8.10 fails to run doctests for some reason if impl(ghc >= 8.10) && impl(ghc < 8.11) buildable: False + -- GHC 9.0 fails to run doctests for some reason too + if impl(ghc >= 9.0) && impl(ghc < 9.1) + buildable: False + -- And GHC 9.2 too + if impl(ghc >= 9.2) && impl(ghc < 9.2.3) + buildable: False + if impl(ghc >= 9.2.3) && impl(ghc < 9.3) + buildable: True build-depends: base -any - , doctest >=0.15 && <0.19 + , doctest >=0.15 && <0.21 , primitive >= 0.6.4.0 && < 0.8 , vector -any + +test-suite vector-inspection + type: exitcode-stdio-1.0 + hs-source-dirs: tests-inspect + Ghc-Options: -Wall + main-is: main.hs + default-language: Haskell2010 + Other-modules: Inspect + if impl(ghc >= 8.6) + Other-modules: Inspect.DerivingVia + Inspect.DerivingVia.OtherFoo + build-depends: + base -any + , primitive >= 0.6.4.0 && < 0.8 + , vector -any + , tasty + , tasty-inspection-testing >= 0.1 + +benchmark algorithms + type: exitcode-stdio-1.0 + main-is: Main.hs + hs-source-dirs: benchmarks + default-language: Haskell2010 + + build-depends: + base >= 2 && < 5 + , random >= 1.2 + , tasty + , tasty-bench >= 0.2.1 + , vector + + ghc-options: -O2 + + other-modules: + Algo.MutableSet + Algo.ListRank + Algo.Rootfix + Algo.Leaffix + Algo.AwShCC + Algo.HybCC + Algo.Quickhull + Algo.Spectral + Algo.Tridiag + Algo.FindIndexR + TestData.ParenTree + TestData.Graph