summary refs log tree commit diff
path: root/pkgs/development/haskell-modules
diff options
context:
space:
mode:
authorsternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-06-19 21:40:11 +0200
committersterni <sternenseemann@systemli.org>2021-06-22 00:18:12 +0200
commitc0b69bcbb9fb1e2dee1181d9087e28a756875526 (patch)
tree5cbbc28f6ad8e6bc6c6cfaa10d90b4aad5bea24b /pkgs/development/haskell-modules
parent83220ad7b933de8e4c5df52d00c4abc097670b74 (diff)
downloadnixpkgs-c0b69bcbb9fb1e2dee1181d9087e28a756875526.tar
nixpkgs-c0b69bcbb9fb1e2dee1181d9087e28a756875526.tar.gz
nixpkgs-c0b69bcbb9fb1e2dee1181d9087e28a756875526.tar.bz2
nixpkgs-c0b69bcbb9fb1e2dee1181d9087e28a756875526.tar.lz
nixpkgs-c0b69bcbb9fb1e2dee1181d9087e28a756875526.tar.xz
nixpkgs-c0b69bcbb9fb1e2dee1181d9087e28a756875526.tar.zst
nixpkgs-c0b69bcbb9fb1e2dee1181d9087e28a756875526.zip
haskellPackages.tasty-discover: simplify override
If we are cross compiling we can't and don't run the tests since they
wouldn't be able to be executed on the host platform.

While native compiling, we need to avoid an infinite recursion.
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix5
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3a63420f121..8fe82094d54 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -478,10 +478,7 @@ self: super: {
   doctest-discover = dontCheck super.doctest-discover;
 
   # Depends on itself for testing
-  tasty-discover = addBuildTool super.tasty-discover
-    (if pkgs.buildPlatform != pkgs.hostPlatform
-     then self.buildHaskellPackages.tasty-discover
-     else dontCheck super.tasty-discover);
+  tasty-discover = dontCheck super.tasty-discover;
 
   # Known issue with nondeterministic test suite failure
   # https://github.com/nomeata/tasty-expected-failure/issues/21