NixOS 16.03
Eelco Dolstra committed
Apr 1, 2016 at 13:21 UTC
6b2d28bfab21728d1983f1c5ac00cf3ea29f73ec
3 files changed
+11
-7
nixos-org/hydra-mirror.nix
+3
-3
@@ -20,7 +20,7 @@ let
20
source /etc/profile
21
cd /home/hydra-mirror/nixos-channel-scripts
22
exec ./mirror-nixos-branch.pl ${channelName} https://hydra.nixos.org/job/${mainJob}/latest-finished \
23
- ${optionalString (channelName == "15.09") "1"}
23
+ ${optionalString (channelName == "nixos-16.03") "1"}
24
''; # */
25
serviceConfig.User = "hydra-mirror";
26
};
@@ -63,8 +63,8 @@ in
63
64
systemd =
65
fold recursiveUpdate {}
66
- [ (makeUpdateChannel "nixos-16.03-beta" "nixos/release-16.03/tested")
67
- (makeUpdateChannel "nixos-16.03-beta-small" "nixos/release-16.03-small/tested")
66
+ [ (makeUpdateChannel "nixos-16.03" "nixos/release-16.03/tested")
67
+ (makeUpdateChannel "nixos-16.03-small" "nixos/release-16.03-small/tested")
68
(makeUpdateChannel "nixos-15.09" "nixos/release-15.09/tested")
69
(makeUpdateChannel "nixos-15.09-small" "nixos/release-15.09-small/tested")
70
(makeUpdateChannel "nixos-unstable" "nixos/trunk-combined/tested")
nixos-org/network.nix
+1
-1
@@ -130,7 +130,7 @@ in
130
fileSystems."/data/releases" =
131
{ device = "/releases";
132
fsType = "none";
133
- options = "bind";
133
+ options = [ "bind" ];
134
};
135
136
system.stateVersion = "14.12";
nixos-org/webserver.nix
+7
-3
@@ -6,7 +6,7 @@ let
6
7
sshKeys = import ../ssh-keys.nix;
8
9
- nixosRelease = "15.09";
9
+ nixosRelease = "16.03";
10
11
nixosVHostConfig =
12
{ hostName = "nixos.org";
@@ -73,7 +73,7 @@ in
73
74
nix.package = builtins.storePath /nix/store/mynhlpqzslmdx9svyp0ig61hvplxv039-nix-1.12pre1234_abcdef;
75
76
- nix.nixPath = [ "nixpkgs=https://nixos.org/channels/nixos-15.09-small/nixexprs.tar.xz" ];
76
+ nix.nixPath = [ "nixpkgs=https://nixos.org/channels/nixos-16.03-small/nixexprs.tar.xz" ];
77
78
security.pam.enableSSHAgentAuth = true;
79
@@ -131,7 +131,8 @@ in
131
#SSLOpenSSLConfCmd DHParameters "${./dhparams.pem}"
132
'';
133
extraSubservices =
134
- [ { function = import <services/subversion>;
134
+ [ /*
135
+ { function = import <services/subversion>;
136
id = "nix";
137
urlPrefix = "";
138
toplevelRedirect = false;
@@ -143,6 +144,8 @@ in
144
logo = "/logo/nixos-lores.png";
145
};
146
}
147
+ */
148
+ /*
149
{ serviceType = "mediawiki";
150
siteName = "Nix Wiki";
151
logo = "/logo/nix-wiki.png";
@@ -188,6 +191,7 @@ in
191
enableUploads = true;
192
uploadDir = "/data/nixos-mediawiki-upload";
193
}
194
+ */
195
];
196
})
197