@cryptotaxi247 / infra-1 / commits / 6c7e1401

Update config

Eelco Dolstra committed Oct 30, 2013 at 11:45 UTC 6c7e1401dc12c64d43dedb791c1f8b1166765b4a
2 files changed +2 -3
delft/common.nix
+2 -2
@@ -32,8 +32,6 @@ with pkgs.lib;
32 hardware.cpu.amd.updateMicrocode = true;
33 hardware.cpu.intel.updateMicrocode = true;
34
35 - environment.nix = pkgs.nixUnstable;
36 -
35 environment.systemPackages =
36 [ pkgs.emacs pkgs.subversion pkgs.sysstat pkgs.hdparm pkgs.sdparm # pkgs.lsiutil
37 pkgs.htop pkgs.sqlite pkgs.iotop pkgs.lm_sensors pkgs.gitFull pkgs.hwloc
@@ -45,6 +43,8 @@ with pkgs.lib;
43 boot.kernel.sysctl."kernel.panic" = 60;
44 boot.kernel.sysctl."kernel.panic_on_oops" = 1;
45
46 + nix.package = pkgs.nixUnstable;
47 +
48 nix.useChroot = true;
49
50 nix.nrBuildUsers = 100;
delft/hydra-module.nix
-1
@@ -135,7 +135,6 @@ in
135
136 nix.maxJobs = 0;
137 nix.distributedBuilds = true;
138 - nix.manualNixMachines = true;
138 nix.useChroot = true;
139 nix.nrBuildUsers = 100;
140