More 15.09 updates
Eelco Dolstra committed
Oct 14, 2015 at 13:00 UTC
01908414355130b607856c6cc0ba43f59cdbdd54
2 files changed
+4
-4
hydra-provisioner/conf.nix
+1
-1
@@ -7,7 +7,7 @@
7
8
systemTypes.x86_64-linux = {
9
nixopsExpr = builtins.toPath ./nixops.nix;
10
- nixPath = [ "nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/nixos-14.12.tar.gz" ];
10
+ nixPath = [ "nixpkgs=https://nixos.org/channels/nixos-15.09-small/nixexprs.tar.xz" ];
11
maxMachines = 12;
12
ignoredRunnables = 250;
13
runnablesPerMachine = 50;
nixos-org/webserver.nix
+3
-3
@@ -6,7 +6,7 @@ let
6
7
sshKeys = import ../ssh-keys.nix;
8
9
- nixosRelease = "14.12";
9
+ nixosRelease = "15.09";
10
11
nixosVHostConfig =
12
{ hostName = "nixos.org";
@@ -309,8 +309,8 @@ in
309
''
310
export NIX_CURL_FLAGS="--silent --show-error --connect-timeout 30"
311
cd /home/tarball-mirror/nixpkgs
312
- git checkout release-${nixosRelease}
313
- git pull
312
+ git remote update channels
313
+ git checkout channels/nixos-${nixosRelease}
314
exec /nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/maintainers/scripts/copy-tarballs.pl
315
'';
316
startAt = "05:30";