wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-08 02:43:54 +02:00
Code Activity

Merge remote-tracking branch 'origin/master' into flakes

Browse source
This commit is contained in:
Eelco Dolstra 2019-11-06 10:44:21 +01:00
commit 88c452d160
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
17 changed files with 155 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,10 +11,10 @@ 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.binaryCaches = [ ];
nix.binaryCaches = lib.mkForce [ ];
};
server =

4
tests/remote-builds.nix
View file

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

2
tests/setuid.nix
View file

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