Author: eelco
Date: Thu Apr 26 15:19:23 2012
New Revision: 33936
URL: https://nixos.org/websvn/nix/?rev=33936&sc=1
Log:
* Set preferLocalBuild on a few trivial top-level derivations. These
tend to cause a lot of unnecessary I/O to the build machines.
Modified:
nixos/trunk/modules/system/activation/top-level.nix
nixos/trunk/modules/system/upstart/upstart.nix
nixos/trunk/modules/virtualisation/qemu-vm.nix
Modified: nixos/trunk/modules/system/activation/top-level.nix
==============================================================================
--- nixos/trunk/modules/system/activation/top-level.nix Thu Apr 26 15:17:43
2012 (r33935)
+++ nixos/trunk/modules/system/activation/top-level.nix Thu Apr 26 15:19:23
2012 (r33936)
@@ -147,6 +147,7 @@
# and makes it bootable.
system = pkgs.stdenv.mkDerivation {
name = "nixos-${config.system.nixosVersion}";
+ preferLocalBuild = true;
buildCommand = systemBuilder;
inherit children;
kernelParams =
Modified: nixos/trunk/modules/system/upstart/upstart.nix
==============================================================================
--- nixos/trunk/modules/system/upstart/upstart.nix Thu Apr 26 15:17:43
2012 (r33935)
+++ nixos/trunk/modules/system/upstart/upstart.nix Thu Apr 26 15:19:23
2012 (r33936)
@@ -135,7 +135,7 @@
in
pkgs.runCommand ("upstart-" + job.name + ".conf")
- { inherit (job) buildHook; inherit jobText; }
+ { inherit (job) buildHook; inherit jobText; preferLocalBuild = true; }
''
eval "$buildHook"
echo "$jobText" > $out
Modified: nixos/trunk/modules/virtualisation/qemu-vm.nix
==============================================================================
--- nixos/trunk/modules/virtualisation/qemu-vm.nix Thu Apr 26 15:17:43
2012 (r33935)
+++ nixos/trunk/modules/virtualisation/qemu-vm.nix Thu Apr 26 15:19:23
2012 (r33936)
@@ -184,6 +184,7 @@
{ exportReferencesGraph =
map (x: [("closure-" + baseNameOf x) x])
config.virtualisation.pathsInNixDB;
buildInputs = [ pkgs.perl ];
+ preferLocalBuild = true;
}
''
printRegistration=1 perl ${pkgs.pathsFromGraph} closure-* > $out
@@ -353,7 +354,7 @@
# Don't run ntpd in the guest. It should get the correct time from KVM.
services.ntp.enable = false;
- system.build.vm = pkgs.runCommand "nixos-vm" {}
+ system.build.vm = pkgs.runCommand "nixos-vm" { preferLocalBuild = true; }
''
ensureDir $out/bin
ln -s ${config.system.build.toplevel} $out/system
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
