@cryptotaxi247 / infra / commits / 30091705

svn path=/configurations/trunk/tud/; revision=12421

svn path=/configurations/trunk/tud/; revision=12421

Eelco Dolstra committed Jul 24, 2008 at 15:04 UTC 300917052bc2cff3cc862e070dc8857975a8b22c
3 files changed +9 -13
buildfarm/jobs.nix
+1 -9
@@ -91,15 +91,6 @@ in
91 jobAttr = "nixRelease";
92 };
93
94 - nixNoBDBBranch = makeNixJob {
95 - dirName = "nix-no-bdb";
96 - inputs = {
97 - nixCheckout = svnInput https://svn.nixos.org/repos/nix/nix/branches/no-bdb;
98 - };
99 - jobExpr = "../jobs/nix/nix.nix";
100 - jobAttr = "nixRelease";
101 - };
102 -
94
95 /* Nixpkgs */
96
@@ -119,6 +110,7 @@ in
110 };
111 jobExpr = "../jobs/nix/nixpkgs.nix";
112 jobAttr = "nixpkgsRelease";
113 + disabled = true;
114 };
115
116
cartman.nix
+6 -2
@@ -18,8 +18,7 @@ let
18
19 supervisor = import ../../release/supervisor/supervisor.nix {
20 stateDir = "/home/buildfarm/buildfarm-state";
21 - #jobsURL = https://svn.cs.uu.nl:12443/repos/trace/configurations/trunk/tud/buildfarm/jobs.nix;
22 - jobsFile = toString /etc/nixos/configurations/tud/buildfarm/jobs.nix;
21 + jobsFile = toString /home/buildfarm/jobs.nix;
22 fromAddress = "TU Delft Nix Buildfarm <e.dolstra@tudelft.nl>";
23 };
24
@@ -55,6 +54,11 @@ rec {
54 maxJobs = 1;
55 distributedBuilds = true;
56 inherit buildMachines;
57 + extraOptions = ''
58 + # The default (`true') slows Nix down a lot since the build farm
59 + # has so many GC roots.
60 + gc-check-reachability = false
61 + '';
62 };
63
64 networking = {
machines.nix
+2 -2
@@ -19,7 +19,7 @@
19 system = "x86_64-linux";
20 aliases = ["linux64-1" "linux64"];
21 maxJobs = 2;
22 - #buildUser = "buildfarm";
22 + buildUser = "buildfarm";
23 };
24 phillip = {
25 ipAddress = "192.168.1.13";
@@ -43,7 +43,7 @@
43 system = "i686-linux";
44 aliases = ["linux32-2"];
45 maxJobs = 2;
46 - #buildUser = "buildfarm";
46 + buildUser = "buildfarm";
47 };
48 token = {
49 ipAddress = "192.168.1.16";