diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-11-05 11:12:25 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2019-11-05 11:12:25 +0100 |
| commit | e1725ba946aa89271bd8ef83f9ecc2e2dc6eb5df (patch) | |
| tree | 848c4762208a7bde387b67bf979fffd67d6753a0 | |
| parent | 6b708711f59b8609162ff7ba59ee9ed8d1ca8487 (diff) | |
Fix VM tests
| -rw-r--r-- | tests/nix-copy-closure.nix | 4 | ||||
| -rw-r--r-- | tests/remote-builds.nix | 4 | ||||
| -rw-r--r-- | tests/setuid.nix | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/nix-copy-closure.nix b/tests/nix-copy-closure.nix index 0dc147fb3..bb5db7410 100644 --- a/tests/nix-copy-closure.nix +++ b/tests/nix-copy-closure.nix @@ -8,11 +8,11 @@ makeTest (let pkgA = pkgs.cowsay; pkgB = pkgs.wget; pkgC = pkgs.hello; in { nodes = { client = - { config, pkgs, ... }: + { config, lib, pkgs, ... }: { virtualisation.writableStore = true; virtualisation.pathsInNixDB = [ pkgA ]; nix.package = nix; - nix.binaryCaches = [ ]; + nix.binaryCaches = lib.mkForce [ ]; }; server = diff --git a/tests/remote-builds.nix b/tests/remote-builds.nix index b867f13b4..18d490830 100644 --- a/tests/remote-builds.nix +++ b/tests/remote-builds.nix @@ -40,7 +40,7 @@ in builder2 = builder; client = - { config, pkgs, ... }: + { config, lib, pkgs, ... }: { nix.maxJobs = 0; # force remote building nix.distributedBuilds = true; nix.buildMachines = @@ -60,7 +60,7 @@ in virtualisation.writableStore = true; virtualisation.pathsInNixDB = [ config.system.build.extraUtils ]; nix.package = nix; - nix.binaryCaches = [ ]; + nix.binaryCaches = lib.mkForce [ ]; programs.ssh.extraConfig = "ConnectTimeout 30"; }; }; diff --git a/tests/setuid.nix b/tests/setuid.nix index 77e83c8d6..63d3c05cb 100644 --- a/tests/setuid.nix +++ b/tests/setuid.nix @@ -10,7 +10,7 @@ makeTest { { config, lib, pkgs, ... }: { virtualisation.writableStore = true; nix.package = nix; - nix.binaryCaches = [ ]; + nix.binaryCaches = lib.mkForce [ ]; nix.nixPath = [ "nixpkgs=${lib.cleanSource pkgs.path}" ]; virtualisation.pathsInNixDB = [ pkgs.stdenv pkgs.pkgsi686Linux.stdenv ]; }; |