From 6ff19ce137e4fa91e0a4b6c67c3af7181faafc10 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 14 Sep 2021 11:34:17 +0200
Subject: nix-tests: Run 'make installcheck' in parallel

---
 flake.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index ee76d9188..3c24c94db 100644
--- a/flake.nix
+++ b/flake.nix
@@ -178,8 +178,8 @@
         installPhase = ''
           mkdir -p $out
         '';
-        installCheckPhase = "make installcheck";
 
+        installCheckPhase = "make installcheck -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES";
       };
 
       binaryTarball = buildPackages: nix: pkgs: let
-- 
cgit v1.2.3


From 2cf8110f5a01901a6d5394d62313e8b8a3a10b7e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 14 Sep 2021 11:34:32 +0200
Subject: flake.nix: Don't do cross builds in 'nix flake check'

'nix flake check' should be relatively fast, so it's not the best
place to do cross-builds. We're already doing that in Hydra.
---
 flake.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index 3c24c94db..7419b82cd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -502,10 +502,7 @@
             # `NIX_DAEMON_SOCKET_PATH` which is required for the tests to work
             # againstLatestStable = testNixVersions pkgs pkgs.nix pkgs.nixStable;
           } "touch $out";
-      } // (if system == "x86_64-linux" then (builtins.listToAttrs (map (crossSystem: {
-        name = "binaryTarball-${crossSystem}";
-        value = self.hydraJobs.binaryTarballCross.${system}.${crossSystem};
-      }) crossSystems)) else {}));
+      });
 
       packages = forAllSystems (system: {
         inherit (nixpkgsFor.${system}) nix;
-- 
cgit v1.2.3