diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 06a838e5b5756..6a45d4fe336bb 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -151,7 +151,7 @@ self: super: { # 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 " " [ + testTargets = [ "vector-tests-O0" "vector-tests-O2" ]; @@ -849,7 +849,7 @@ self: super: { CHXHtml = dontDistribute super.CHXHtml; # https://github.com/NixOS/nixpkgs/issues/6350 - paypal-adaptive-hoops = overrideCabal (drv: { testTarget = "local"; }) super.paypal-adaptive-hoops; + paypal-adaptive-hoops = overrideCabal (drv: { testTargets = [ "local" ]; }) super.paypal-adaptive-hoops; # Avoid "QuickCheck >=2.3 && <2.10" dependency we cannot fulfill in lts-11.x. test-framework = dontCheck super.test-framework; @@ -2629,7 +2629,7 @@ self: super: { rm Setup.hs ''; # doctest suite uses doctest-parallel which still doesn't work in nixpkgs - testTarget = "tests"; + testTargets = [ "tests" ]; }) super.conduit-aeson; # Upper bounds are too strict: @@ -2638,7 +2638,7 @@ self: super: { # Disabling doctests. regex-tdfa = overrideCabal { - testTarget = "regex-tdfa-unittest"; + testTargets = [ "regex-tdfa-unittest" ]; } super.regex-tdfa; # Missing test files https://github.com/kephas/xdg-basedir-compliant/issues/1 diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 4730ed4e45733..b6067eb1a8245 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -75,7 +75,7 @@ self: super: builtins.intersectAttrs super { chmod +x "$out/bin/haskell-language-server" ''; testToolDepends = [ self.cabal-install pkgs.git ]; - testTarget = "func-test"; # wrapper test accesses internet + testTargets = [ "func-test" ]; # wrapper test accesses internet preCheck = '' export PATH=$PATH:$PWD/dist/build/haskell-language-server:$PWD/dist/build/haskell-language-server-wrapper export HOME=$TMPDIR @@ -379,7 +379,7 @@ self: super: builtins.intersectAttrs super { digitalocean-kzs = dontCheck super.digitalocean-kzs; # https://github.com/KazumaSATO/digitalocean-kzs/issues/1 github-types = dontCheck super.github-types; # http://hydra.cryp.to/build/1114046/nixlog/1/raw hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw - hjsonschema = overrideCabal (drv: { testTarget = "local"; }) super.hjsonschema; + hjsonschema = overrideCabal (drv: { testTargets = [ "local" ]; }) super.hjsonschema; marmalade-upload = dontCheck super.marmalade-upload; # http://hydra.cryp.to/build/501904/nixlog/1/raw mongoDB = dontCheck super.mongoDB; network-transport-tcp = dontCheck super.network-transport-tcp; @@ -741,7 +741,7 @@ self: super: builtins.intersectAttrs super { # Not running the "example" test because it requires a binary from lsps test # suite which is not part of the output of lsp. - lsp-test = overrideCabal (old: { testTarget = "tests func-test"; }) super.lsp-test; + lsp-test = overrideCabal (old: { testTargets = [ "tests" "func-test" ]; }) super.lsp-test; # the test suite attempts to run the binaries built in this package # through $PATH but they aren't in $PATH @@ -1301,7 +1301,7 @@ self: super: builtins.intersectAttrs super { "-p" "!/oeis/" ]; # disco-examples needs network access - testTarget = "disco-tests"; + testTargets = [ "disco-tests" ]; }) super.disco; # Apply a patch which hardcodes the store path of graphviz instead of using diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 14afa3dfe6b44..6108a29d3a269 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -83,7 +83,9 @@ in , pkg-configDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? [] , testDepends ? [], testHaskellDepends ? [], testSystemDepends ? [], testFrameworkDepends ? [] , benchmarkDepends ? [], benchmarkHaskellDepends ? [], benchmarkSystemDepends ? [], benchmarkFrameworkDepends ? [] -, testTarget ? "", testFlags ? [] +, # testTarget is deprecated starting with 25.05. Use testTargets instead. + testTarget ? lib.concatStringsSep " " testTargets +, testTargets ? [], testFlags ? [] , broken ? false , preCompileBuildDriver ? null, postCompileBuildDriver ? null , preUnpack ? null, postUnpack ? null