maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix test evaluation

Browse source
This commit is contained in:
Eelco Dolstra 2014-04-15 15:32:27 +02:00
parent a1917208c0
commit fb5d76b89e
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,14 +4,14 @@
with import <nixpkgs/nixos/lib/testing.nix> { inherit system; }; with import <nixpkgs/nixos/lib/testing.nix> { inherit system; };
makeTest ({ pkgs, ... }: let pkgA = pkgs.aterm; pkgB = pkgs.wget; in { makeTest (let pkgA = pkgs.aterm; pkgB = pkgs.wget; in {
nodes = nodes =
{ client = { client =
{ config, pkgs, ... }: { config, pkgs, ... }:
{ virtualisation.writableStore = true; { virtualisation.writableStore = true;
virtualisation.pathsInNixDB = [ pkgA ]; virtualisation.pathsInNixDB = [ pkgA ];
environment.nix = nix; nix.package = nix;
}; };
server = server =
@ -19,7 +19,7 @@ makeTest ({ pkgs, ... }: let pkgA = pkgs.aterm; pkgB = pkgs.wget; in {
{ services.openssh.enable = true; { services.openssh.enable = true;
virtualisation.writableStore = true; virtualisation.writableStore = true;
virtualisation.pathsInNixDB = [ pkgB ]; virtualisation.pathsInNixDB = [ pkgB ];
environment.nix = nix; nix.package = nix;
}; };
}; };

4
tests/remote-builds.nix
View file

@ -4,7 +4,7 @@
with import <nixpkgs/nixos/lib/testing.nix> { inherit system; }; with import <nixpkgs/nixos/lib/testing.nix> { inherit system; };
makeTest ({ pkgs, ... }: makeTest (
let let
@ -57,7 +57,7 @@ in
]; ];
virtualisation.writableStore = true; virtualisation.writableStore = true;
virtualisation.pathsInNixDB = [ config.system.build.extraUtils ]; virtualisation.pathsInNixDB = [ config.system.build.extraUtils ];
environment.nix = nix; nix.package = nix;
}; };
}; };