lulu-berlin/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Fix VM tests

Browse source
This commit is contained in:
Eelco Dolstra 2019-11-05 11:12:25 +01:00
parent 6b708711f5
commit e1725ba946
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/nix-copy-closure.nix
View file

@ -8,11 +8,11 @@ makeTest (let pkgA = pkgs.cowsay; pkgB = pkgs.wget; pkgC = pkgs.hello; in {
nodes = nodes =
{ client = { client =
{ config, pkgs, ... }: { config, lib, pkgs, ... }:
{ virtualisation.writableStore = true; { virtualisation.writableStore = true;
virtualisation.pathsInNixDB = [ pkgA ]; virtualisation.pathsInNixDB = [ pkgA ];
nix.package = nix; nix.package = nix;
nix.binaryCaches = [ ]; nix.binaryCaches = lib.mkForce [ ];
}; };
server = server =

4
tests/remote-builds.nix
View file

@ -40,7 +40,7 @@ in
builder2 = builder; builder2 = builder;
client = client =
{ config, pkgs, ... }: { config, lib, pkgs, ... }:
{ nix.maxJobs = 0; # force remote building { nix.maxJobs = 0; # force remote building
nix.distributedBuilds = true; nix.distributedBuilds = true;
nix.buildMachines = nix.buildMachines =
@ -60,7 +60,7 @@ in
virtualisation.writableStore = true; virtualisation.writableStore = true;
virtualisation.pathsInNixDB = [ config.system.build.extraUtils ]; virtualisation.pathsInNixDB = [ config.system.build.extraUtils ];
nix.package = nix; nix.package = nix;
nix.binaryCaches = [ ]; nix.binaryCaches = lib.mkForce [ ];
programs.ssh.extraConfig = "ConnectTimeout 30"; programs.ssh.extraConfig = "ConnectTimeout 30";
}; };
}; };

2
tests/setuid.nix
View file

@ -10,7 +10,7 @@ makeTest {
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ virtualisation.writableStore = true; { virtualisation.writableStore = true;
nix.package = nix; nix.package = nix;
nix.binaryCaches = [ ]; nix.binaryCaches = lib.mkForce [ ];
nix.nixPath = [ "nixpkgs=${lib.cleanSource pkgs.path}" ]; nix.nixPath = [ "nixpkgs=${lib.cleanSource pkgs.path}" ];
virtualisation.pathsInNixDB = [ pkgs.stdenv pkgs.pkgsi686Linux.stdenv ]; virtualisation.pathsInNixDB = [ pkgs.stdenv pkgs.pkgsi686Linux.stdenv ];
}; };