b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #222190 from sternenseemann/vector-tests

Browse source 
haskell.packages.*.vector: clean up and unify overrides, run tests
This commit is contained in:
Dennis Gosnell 2023-03-27 09:13:16 +09:00 committed by GitHub
parent 40ae072ae9 0cce97d64e
commit 4c75508d6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -100,6 +100,15 @@ self: super: {
guardian
;
vector = overrideCabal (old: {
# Too strict bounds on doctest which isn't used, but is part of the configuration
jailbreak = true;
# vector-doctest seems to be broken when executed via ./Setup test
testTarget = lib.concatStringsSep " " [
"vector-tests-O0"
"vector-tests-O2"
];
}) super.vector;
# There are numerical tests on random data, that may fail occasionally
lapack = dontCheck super.lapack;
@ -230,10 +239,6 @@ self: super: {
pandoc-cli = throwIfNot (versionOlder super.pandoc.version "3.0.0") "pandoc-cli contains the pandoc executable starting with 3.0, this needs to be considered now." (markBroken (dontDistribute super.pandoc-cli));
# sse2 flag due to https://github.com/haskell/vector/issues/47.
# Jailbreak is necessary for QuickCheck dependency.
vector = doJailbreak (if pkgs.stdenv.isi686 then appendConfigureFlag "--ghc-options=-msse2" super.vector else super.vector);
inline-c-cpp = overrideCabal (drv: {
patches = drv.patches or [] ++ [
(fetchpatch {

3
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View file

@ -118,9 +118,6 @@ self: super: {
ormolu = super.ormolu_0_2_0_0;
# vector 0.12.2 indroduced doctest checks that don’t work on older compilers
vector = dontCheck super.vector;
ghc-api-compat = doDistribute (unmarkBroken super.ghc-api-compat_8_6);
mime-string = disableOptimization super.mime-string;

1
pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
View file

@ -81,7 +81,6 @@ self: super: {
tar = doJailbreak super.tar;
time-compat = doJailbreak super.time-compat;
tuple = addBuildDepend self.base-orphans super.tuple;
vector = doJailbreak (dontCheck super.vector);
vector-binary-instances = doJailbreak super.vector-binary-instances;
vector-th-unbox = doJailbreak super.vector-th-unbox;
zlib = doJailbreak super.zlib;

2
pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
View file

@ -60,8 +60,6 @@ self: super: {
# https://mail.haskell.org/pipermail/haskell-cafe/2022-October/135613.html
language-javascript_0_7_0_0 = dontCheck super.language-javascript_0_7_0_0;
vector = dontCheck super.vector;
# Apply patches from head.hackage.
language-haskell-extract = appendPatch (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/language-haskell-extract-0.2.4.patch";

1
pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
View file

@ -137,7 +137,6 @@ in {
tomland = doJailbreak super.tomland;
type-equality = doJailbreak super.type-equality;
unordered-containers = doJailbreak super.unordered-containers;
vector = dontCheck super.vector;
vector-binary-instances = doJailbreak super.vector-binary-instances;
hpack = overrideCabal (drv: {

10
pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
View file

@ -110,16 +110,6 @@ self: super: {
# XXX: 1.3 supports 9.6 properly, but is intended for bifunctors >= 5.6
semialign = doJailbreak super.semialign;
# Not using latest vector version yet…
vector = doDistribute (overrideCabal {
jailbreak = true;
# vector-doctest seems to be broken when executed via ./Setup test
testTarget = lib.concatStringsSep " " [
"vector-tests-O0"
"vector-tests-O2"
];
} super.vector);
#
# Too strict bounds, waiting on Revision in nixpkgs
#