NixOS 16.03 changes
Eelco Dolstra committed
Apr 7, 2016 at 18:28 UTC
9d00d0266625701effcde1583193211e5b11e52f
6 files changed
+14
-13
delft/build-machines-dell-1950.nix
+1
-1
@@ -11,7 +11,7 @@
11
fileSystems =
12
[ { mountPoint = "/";
13
label = "nixos";
14
- options = "noatime";
14
+ options = [ "noatime" ];
15
}
16
];
17
delft/build-machines-dell-r815.nix
+2
-2
@@ -8,13 +8,13 @@
8
9
fileSystems."/" =
10
{ label = "nixos";
11
- options = "noatime";
11
+ options = [ "noatime" ];
12
};
13
14
fileSystems."/tmp" =
15
{ device = "none";
16
fsType = "tmpfs";
17
- options = "size=50%";
17
+ options = [ "size=50%" ];
18
neededForBoot = true;
19
};
20
delft/common.nix
+1
-3
@@ -18,12 +18,10 @@ with pkgs.lib;
18
19
services.openssh.authorizedKeysFiles = mkForce [ "/etc/ssh/authorized_keys.d/%u" ];
20
21
- boot.kernelPackages = pkgs.linuxPackages_3_14;
21
+ #boot.kernelPackages = pkgs.linuxPackages_3_14;
22
23
boot.kernelModules = [ "coretemp" ];
24
25
- boot.supportedFilesystems = [ "nfs" ];
26
-
25
# Prevent "out of sync" errors on the KVM switch.
26
boot.vesa = false;
27
boot.blacklistedKernelModules = [ "radeonfb" "radeon" "i915" ];
delft/delft-webserver.nix
+4
-3
@@ -120,7 +120,8 @@ in
120
url = http://www.st.ewi.tudelft.nl/;
121
logo = "/serg-logo.png";
122
};
123
- } /*
123
+ }
124
+ /*
125
{ function = import /etc/nixos/services/subversion;
126
id = "ptg";
127
urlPrefix = "/ptg";
@@ -131,7 +132,8 @@ in
132
url = http://www.st.ewi.tudelft.nl/;
133
logo = "/serg-logo.png";
134
};
134
- } */
135
+ }
136
+ */
137
{ serviceType = "zabbix";
138
urlPrefix = "/zabbix";
139
}
@@ -217,5 +219,4 @@ in
219
nixpkgs.config.packageOverrides = pkgs: {
220
php = pkgs.php56;
221
};
220
-
222
}
delft/lucifer.nix
+3
-3
@@ -30,20 +30,20 @@ with lib;
30
fileSystems."/fatdata" =
31
{ device = "/dev/fatdisk/fatdata";
32
neededForBoot = true;
33
- options = "defaults,noatime";
33
+ options = [ "defaults" "noatime" ];
34
};
35
36
fileSystems."/nix" =
37
{ device = "/fatdata/nix";
38
fsType = "none";
39
- options = "bind";
39
+ options = [ "bind" ];
40
neededForBoot = true;
41
};
42
43
fileSystems."/nix/var/nix" =
44
{ device = "/nix-data";
45
fsType = "none";
46
- options = "bind";
46
+ options = [ "bind" ];
47
neededForBoot = true;
48
};
49
delft/static-net-config.nix
+3
-1
@@ -21,7 +21,7 @@ in
21
SUBSYSTEM!="net", GOTO="my_end"
22
IMPORT{builtin}="net_id"
23
KERNEL=="vnet*", GOTO="my_end"
24
- NAME=="", ENV{ID_NET_NAME_MAC}!="", NAME="$env{ID_NET_NAME_MAC}"
24
+ ENV{ID_NET_NAME_MAC}!="", NAME="$env{ID_NET_NAME_MAC}"
25
LABEL="my_end"
26
'';
27
@@ -33,6 +33,7 @@ in
33
34
networking.nameservers = mkDefault [ "130.161.180.1" "130.161.180.65" "131.155.0.38" ];
35
36
+ /*
37
networking.extraHosts =
38
''
39
2001:610:685:1:216:3eff:fe00:1 tweek
@@ -40,6 +41,7 @@ in
41
2001:610:685:1:216:3eff:fe00:7 beastie
42
2001:610:685:1:216:3eff:fe00:8 demon
43
'';
44
+ */
45
46
system.build.mainPhysicalInterface = iface;
47