From f28e8302f4216f40d7f13315648f3de6c028f0f7 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 26 Jul 2022 18:40:11 +0200 Subject: [PATCH] haskellPackages.conduit-aeson: unbreak * Work around broken Setup.hs which fails to parse * Disable doctest-parallel suite * Group doctest-parallel overrides and link the upstream issue for the failure; basically it does not work unless you are using cabal v2 commands. --- .../haskell-modules/configuration-common.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 327f850c0470..9d4876533a11 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2570,8 +2570,21 @@ self: super: { # https://github.com/klapaucius/vector-hashtables/issues/11 vector-hashtables = doJailbreak super.vector-hashtables; - # doctests don‘t work. + # doctest-parallel is broken with v1-style cabal-install / Setup.hs + # https://github.com/martijnbastiaan/doctest-parallel/issues/22 doctest-parallel = dontCheck super.doctest-parallel; + clash-prelude = dontCheck super.clash-prelude; + + # Ships a broken Setup.hs + # https://github.com/lehins/conduit-aeson/issues/1 + conduit-aeson = overrideCabal (drv: { + postPatch = '' + ${drv.postPatch or ""} + rm Setup.hs + ''; + # doctest suite uses doctest-parallel which still doesn't work in nixpkgs + testTarget = "tests"; + }) super.conduit-aeson; # Disabling doctests. regex-tdfa = overrideCabal { @@ -2626,7 +2639,4 @@ in { purescript-ast = purescriptStOverride super.purescript-ast; purenix = purescriptStOverride super.purenix; - - # tests use doctest-parallel which produces some errors during testing - clash-prelude = dontCheck super.clash-prelude; })