Inline collectChecks

cardano-foundation · Dec 3, 2019 · bf51372 · bf51372
1 parent 0d46921
commit bf51372
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/default.nix b/default.nix
@@ -24,11 +24,6 @@ let
     inherit pkgs src jmPkgs;
   };
 
-  collectChecks = packageSel: haskellPackages:
-    (pkgs.lib.mapAttrs (_: package: package.checks // { recurseForDerivations = true; })
-     (pkgs.lib.filterAttrs (name: package: (package.isHaskell or false) && packageSel package) haskellPackages))
-    // { recurseForDerivations = true; };
-
   self = {
     inherit pkgs iohkLib src haskellPackages;
     inherit jormungandr jormungandr-cli;
@@ -41,7 +36,8 @@ let
       haskellBuildUtils = iohkLib.haskellBuildUtils.package;
     };
 
-    tests = collectChecks isCardanoWallet haskellPackages;
+    tests = pkgs.recurseIntoAttrs (pkgs.lib.mapAttrs (_: package: package.checks)
+       (pkgs.lib.filterAttrs (_: package: isCardanoWallet package) haskellPackages));
     benchmarks = collectComponents "benchmarks" isCardanoWallet haskellPackages;
 
     dockerImage = pkgs.callPackage ./nix/docker.nix {

diff --git a/nix/util.nix b/nix/util.nix
@@ -4,8 +4,9 @@ with pkgs.lib;
 
 {
   isCardanoWallet = package:
-    (hasPrefix "cardano-wallet" package.identifier.name) ||
-    (elem package.identifier.name [ "text-class" "bech32" ]);
+    (package.isHaskell or false) &&
+      ((hasPrefix "cardano-wallet" package.identifier.name) ||
+       (elem package.identifier.name [ "text-class" "bech32" ]));
 
   inherit (pkgs.haskell-nix.haskellLib) collectComponents;
 }