* Remove the obsolete infrastructure.nix. Specify the machine types in the corresponding config modules.
* Remove the obsolete infrastructure.nix. Specify the machine types in the corresponding config modules. svn path=/configurations/trunk/tud/; revision=25127
Eelco Dolstra committed
Dec 14, 2010 at 14:07 UTC
cf7d2f75ff8ca909d174cb8666e680093e9692bf
8 files changed
+14
-43
build-machines-dell-1950.nix
+2
@@ -5,6 +5,8 @@
5
{
6
require = [ ./build-machines-common.nix ];
7
8
+ nixpkgs.system = "x86_64-linux";
9
+
10
boot.initrd.kernelModules = [ "mptsas" "ext4" ];
11
boot.kernelModules = [ "acpi-cpufreq" "kvm-intel" ];
12
build-machines-hps.nix
+2
@@ -5,6 +5,8 @@
5
{
6
require = [ ./build-machines-common.nix ];
7
8
+ nixpkgs.system = "i686-linux";
9
+
10
boot.initrd.kernelModules = ["3w_xxxx"];
11
boot.kernelModules = ["kvm-intel"];
12
cartman.nix
+2
@@ -30,6 +30,8 @@ in
30
rec {
31
require = [ ./common.nix ];
32
33
+ nixpkgs.system = "i686-linux";
34
+
35
environment.nix = pkgs.nixSqlite;
36
37
boot = {
hydra.nix
+2
@@ -18,6 +18,8 @@ in
18
{
19
require = [ ./common.nix ];
20
21
+ nixpkgs.system = "x86_64-linux";
22
+
23
environment.nix = pkgs.nixSqlite;
24
25
boot = {
infrastructure.nix
deleted
-43
@@ -1,43 +0,0 @@
1
-{
2
- # !!! should be merged with machines.nix
3
- jimmy =
4
- { hostname = "jimmy";
5
- system = "i686-linux";
6
- };
7
- timmy =
8
- { hostname = "timmy";
9
- system = "i686-linux";
10
- };
11
- kenny =
12
- { hostname = "kenny";
13
- system = "x86_64-linux";
14
- };
15
- stan =
16
- { hostname = "stan";
17
- system = "x86_64-linux";
18
- };
19
- kyle =
20
- { hostname = "kyle";
21
- system = "x86_64-linux";
22
- };
23
- cartman =
24
- { hostname = "cartman";
25
- system = "i686-linux";
26
- };
27
- hydra =
28
- { hostname = "hydra";
29
- system = "x86_64-linux";
30
- };
31
- lucifer =
32
- { hostname = "lucifer";
33
- system = "x86_64-linux";
34
- };
35
- mrkitty =
36
- { hostname = "mrkitty";
37
- system = "x86_64-linux";
38
- };
39
- mrhankey =
40
- { hostname = "mrhankey";
41
- system = "x86_64-linux";
42
- };
43
-}
lucifer.nix
+2
@@ -3,6 +3,8 @@
3
{
4
require = [ ./common.nix ];
5
6
+ nixpkgs.system = "x86_64-linux";
7
+
8
environment.nix = pkgs.nixSqlite;
9
10
networking.hostName = "lucifer";
mrhankey.nix
+2
@@ -5,6 +5,8 @@ with pkgs.lib;
5
{
6
require = [ ./common.nix ];
7
8
+ nixpkgs.system = "x86_64-linux";
9
+
10
virtualisation.xen.enable = true;
11
virtualisation.xen.domain0MemorySize = 512;
12
mrkitty.nix
+2
@@ -17,6 +17,8 @@ in
17
{
18
require = [ "${modulesPath}/virtualisation/xen-domU.nix" ./common.nix ];
19
20
+ nixpkgs.system = "x86_64-linux";
21
+
22
networking.hostName = "mrkitty";
23
24
fileSystems =