public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* hydra: added option to self manage nix.machines (for buildfarm purposes)

Browse Source 
svn path=/nixos/trunk/; revision=20121
This commit is contained in:
Rob Vermaas 2010-02-19 09:48:24 +00:00
parent 093b51a562
commit a87ee76cb3
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/services/misc/nix-daemon.nix
View File

@ -66,6 +66,14 @@ in
"; ";
}; };
manualNixMachines = mkOption {
default = false;
description = "
Whether to manually manage the list of buildmachines used in distributed
builds in /etc/nix.machines.
";
};
daemonNiceLevel = mkOption { daemonNiceLevel = mkOption {
default = 10; default = 10;
description = " description = "
@ -182,7 +190,7 @@ in
} }
] ]
++ optional config.nix.distributedBuilds ++ optional (config.nix.distributedBuilds && !config.nix.manualNixMachines)
{ # List of machines for distributed Nix builds in the format expected { # List of machines for distributed Nix builds in the format expected
# by build-remote.pl. # by build-remote.pl.
source = pkgs.writeText "nix.machines" source = pkgs.writeText "nix.machines"
@ -205,6 +213,9 @@ in
'' ''
export PATH=${if config.nix.distributedBuilds then "${pkgs.openssh}/bin:${pkgs.gzip}/bin:" else ""}${pkgs.openssl}/bin:${nix}/bin:$PATH export PATH=${if config.nix.distributedBuilds then "${pkgs.openssh}/bin:${pkgs.gzip}/bin:" else ""}${pkgs.openssl}/bin:${nix}/bin:$PATH
${config.nix.envVars} ${config.nix.envVars}
# To reduce the load on Hydra, don't start all those
# unnecessary substituter processes.
export NIX_SUBSTITUTERS=
exec \ exec \
nice -n ${builtins.toString config.nix.daemonNiceLevel} \ nice -n ${builtins.toString config.nix.daemonNiceLevel} \
${pkgs.utillinux}/bin/ionice -n ${builtins.toString config.nix.daemonIONiceLevel} \ ${pkgs.utillinux}/bin/ionice -n ${builtins.toString config.nix.daemonIONiceLevel} \