Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

haskell.packages.*.vector: clean up and unify overrides, run tests #222190

Merged
merged 1 commit into from
Mar 27, 2023
Merged

haskell.packages.*.vector: clean up and unify overrides, run tests #222190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,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;
Expand Down Expand Up @@ -208,10 +217,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 {
Expand Down
3 changes: 0 additions & 3 deletions pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
10 changes: 0 additions & 10 deletions pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down