Updates for NixOS 15.09
Eelco Dolstra committed
Sep 3, 2015 at 16:10 UTC
d960050495561258f5795f139dc969a41dcead95
5 files changed
+14
-4
delft/common.nix
+2
@@ -5,6 +5,8 @@ with pkgs.lib;
5
{
6
imports = [ ./static-net-config.nix ];
7
8
+ system.stateVersion = "14.12";
9
+
10
nixpkgs.config.allowUnfree = true;
11
12
users.mutableUsers = false;
delft/delft-webserver.nix
+4
@@ -294,4 +294,8 @@ in
294
chown wwwrun ${hydraCacheDir}
295
'';
296
297
+ nixpkgs.config.packageOverrides = pkgs: {
298
+ php = pkgs.php54;
299
+ };
300
+
301
}
delft/stan.nix
+4
@@ -12,6 +12,7 @@
12
13
nix.maxJobs = 8;
14
15
+ /*
16
services.httpd.enable = true;
17
services.httpd.adminAddr = "foo@example.org";
18
@@ -19,7 +20,9 @@
20
networking.firewall.allowedTCPPorts = [ 80 ];
21
networking.firewall.rejectPackets = true;
22
networking.firewall.allowPing = true;
23
+ */
24
25
+ /*
26
networking.bridges.veno1.interfaces = [ config.system.build.mainPhysicalInterface ];
27
28
# Libvirt dynamically creates vnet* interfaces to connect interfaces
@@ -35,4 +38,5 @@
38
system.build.mainVirtualInterface = "veno1";
39
40
virtualisation.libvirtd.enable = true;
41
+ */
42
}
delft/static-net-config.nix
+2
-2
@@ -1,6 +1,6 @@
1
-{ config, pkgs, ... }:
1
+{ config, lib, pkgs, ... }:
2
3
-with pkgs.lib;
3
+with lib;
4
5
let
6
delft/wendy.nix
+2
-2
@@ -154,8 +154,8 @@ in
154
#systemd.services.httpd.serviceConfig.ControlGroupAttribute = [ "memory.memsw.limit_in_bytes 1500M" ];
155
156
services.zabbixServer.enable = true;
157
- services.zabbixServer.dbServer = "wendy";
158
- services.zabbixServer.dbPassword = import ./zabbix-password.nix;
157
+ #services.zabbixServer.dbServer = "wendy";
158
+ #services.zabbixServer.dbPassword = import ./zabbix-password.nix;
159
160
# Poor man's time sync for the non-NixOS machines.
161
/*