Author: eelco
Date: Thu Dec 2 18:13:19 2010
New Revision: 24957
URL: https://svn.nixos.org/websvn/nix/?rev=24957&sc=1
Log:
* Use nixos-deploy-network.
Modified:
configurations/trunk/tud/cartman.nix
configurations/trunk/tud/infrastructure.nix
configurations/trunk/tud/network.nix
Modified: configurations/trunk/tud/cartman.nix
==============================================================================
--- configurations/trunk/tud/cartman.nix Thu Dec 2 18:09:53 2010
(r24956)
+++ configurations/trunk/tud/cartman.nix Thu Dec 2 18:13:19 2010
(r24957)
@@ -30,6 +30,8 @@
rec {
require = [ ./common.nix ];
+ environment.nix = pkgs.nixSqlite;
+
boot = {
loader.grub.device = "/dev/sda";
loader.grub.copyKernels = true;
Modified: configurations/trunk/tud/infrastructure.nix
==============================================================================
--- configurations/trunk/tud/infrastructure.nix Thu Dec 2 18:09:53 2010
(r24956)
+++ configurations/trunk/tud/infrastructure.nix Thu Dec 2 18:13:19 2010
(r24957)
@@ -1,39 +1,35 @@
{
# !!! should be merged with machines.nix
- terrance =
- { hostName = "terrance";
- system = "x86_64-linux";
- };
- phillip =
- { hostName = "phillip";
- system = "x86_64-linux";
- };
jimmy =
- { hostName = "jimmy";
+ { hostname = "jimmy";
system = "i686-linux";
};
timmy =
- { hostName = "timmy";
+ { hostname = "timmy";
system = "i686-linux";
};
kenny =
- { hostName = "kenny";
+ { hostname = "kenny";
system = "x86_64-linux";
};
stan =
- { hostName = "stan";
+ { hostname = "stan";
system = "x86_64-linux";
};
kyle =
- { hostName = "kyle";
+ { hostname = "kyle";
system = "x86_64-linux";
};
cartman =
- { hostName = "cartman";
+ { hostname = "cartman";
system = "i686-linux";
};
hydra =
- { hostName = "hydra";
+ { hostname = "hydra";
+ system = "x86_64-linux";
+ };
+ lucifer =
+ { hostname = "lucifer";
system = "x86_64-linux";
};
}
Modified: configurations/trunk/tud/network.nix
==============================================================================
--- configurations/trunk/tud/network.nix Thu Dec 2 18:09:53 2010
(r24956)
+++ configurations/trunk/tud/network.nix Thu Dec 2 18:13:19 2010
(r24957)
@@ -1,6 +1,4 @@
{
- terrance = import ./build-machines-hps.nix;
- phillip = import ./build-machines-hps.nix;
jimmy = import ./build-machines-hps.nix;
timmy = import ./build-machines-hps.nix;
kenny = import ./build-machines-dell-1950.nix;
@@ -8,4 +6,5 @@
kyle = import ./build-machines-dell-1950.nix;
cartman = import ./cartman.nix;
hydra = import ./hydra.nix;
+ lucifer = import ./lucifer.nix;
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
