From 0cce97d64ecdd009381c4464d82a7cbd1f547068 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 20 Mar 2023 14:14:41 +0100 Subject: [PATCH] haskell.packages.*.vector: clean up and unify overrides, run tests - The dontCheck overrides are not necessary completely. It seems that there is some kind of issue with the doctest suite, but we can run the other ones. - We need a jailbreak everywhere due to doctest (ironically), so we can move that into the common configuration. - The i686 issue has been closed upstream. Tested locally to confirm that it is indeed not a problem anymore. --- .../haskell-modules/configuration-common.nix | 13 +++++++++---- .../haskell-modules/configuration-ghc-8.8.x.nix | 3 --- .../haskell-modules/configuration-ghc-9.0.x.nix | 1 - .../haskell-modules/configuration-ghc-9.2.x.nix | 2 -- .../haskell-modules/configuration-ghc-9.4.x.nix | 1 - .../haskell-modules/configuration-ghc-9.6.x.nix | 10 ---------- 6 files changed, 9 insertions(+), 21 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d513772370ef..fe3ba4f76781 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -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; @@ -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 { diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 82e221af6c57..01cb34881516 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -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; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 3ed8d155e8e0..3c59f6b80d66 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -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; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 0ca632378c9d..0416124a6c31 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -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"; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index f9ce2a5165aa..a1c0c3e184dd 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -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: { diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index ef7c4c613911..8ac5d1ee9f74 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -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 #