Author: eelco
Date: Tue Dec 21 15:39:21 2010
New Revision: 25226
URL: https://svn.nixos.org/websvn/nix/?rev=25226&sc=1
Log:
Modified:
configurations/trunk/tud/hydra.nix
Modified: configurations/trunk/tud/hydra.nix
==============================================================================
--- configurations/trunk/tud/hydra.nix Tue Dec 21 15:14:33 2010 (r25225)
+++ configurations/trunk/tud/hydra.nix Tue Dec 21 15:39:21 2010 (r25226)
@@ -1,20 +1,5 @@
{ config, pkgs, ... }:
-let
-
- machines = import ./machines.nix pkgs.lib;
-
- # Produce the list of Nix build machines in the format expected by
- # the Nix daemon Upstart job.
- buildMachines =
- let addKey = machine: machine //
- { sshKey = "/root/.ssh/id_buildfarm";
- sshUser = machine.buildUser;
- };
- in map addKey (pkgs.lib.filter (machine: machine ? buildUser) machines);
-
-in
-
{
require = [ ./common.nix ];
@@ -41,8 +26,6 @@
nix = {
maxJobs = 8;
- inherit buildMachines;
-
extraOptions = ''
gc-keep-outputs = true
gc-keep-derivations = true
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
