16.03 -> 16.09
Eelco Dolstra committed
Oct 12, 2016 at 17:36 UTC
dd9a582cddee7ab5bf6747106bfbefc434077d0c
2 files changed
+7
-15
nixos-org/tarball-mirror.nix
+1
-1
@@ -8,7 +8,7 @@ with lib;
8
9
let
10
11
- nixosRelease = "16.03";
11
+ nixosRelease = "16.09";
12
13
in
14
nixos-org/webserver.nix
+6
-14
@@ -1,6 +1,6 @@
1
-{ config, pkgs, resources, ... }:
1
+{ config, lib, pkgs, resources, ... }:
2
3
-with pkgs.lib;
3
+with lib;
4
5
let
6
@@ -81,7 +81,7 @@ in
81
82
nix.package = pkgs.nixUnstable;
83
84
- nix.nixPath = [ "nixpkgs=https://nixos.org/channels/nixos-16.03-small/nixexprs.tar.xz" ];
84
+ nix.nixPath = [ "nixpkgs=https://nixos.org/channels/nixos-16.09-small/nixexprs.tar.xz" ];
85
86
security.pam.enableSSHAgentAuth = true;
87
@@ -273,20 +273,12 @@ in
273
[ "ssh-dss AAAAB3NzaC1kc3MAAACBAMrcUf4qQj8XcG1nfG5/6rbfb4a89nV13KcJLBOVWa3Tn4YHeVz1lQDRHvnLK9YKM7MybDXD2wVG5nKuMbJMW5aZPEGrVUM4SQFXtnaNBgmoACrbG978Da/vNjGY89Q7GS/YqA24ASKnc09cRFsTmU0e/9BCbz9zXO4sJ8GaGHz7AAAAFQDZrJCdxTQ8GVvoFjL9Q1s1VHiClwAAAIBK+6r/kP/9VUzfRepEHCVObTIRYIhC9YcIZe2pMyCQSUIAjkGd5hkA8XQecs5/ym5Ddm2j61Kvt2jtGXQVP2F04wIFDuGK4GAfPpYjvLJaXtVxj1Ho4K2W/+WgKG1NEh466myZNsHr3v1MufbxNIS03lg6s8oJI4TmCaWtVHNW+AAAAIEAqh+ablUfEZAr6" ];
274
};
275
276
- systemd.services.update-channels =
277
- { description = "Update Channels";
278
- environment.CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt";
279
- environment.HOME = "/root";
280
- serviceConfig.Type = "oneshot";
281
- serviceConfig.ExecStart = "${config.nix.package}/bin/nix-channel --update";
282
- startAt = "*:0/33";
283
- };
284
-
276
systemd.services.update-homepage =
277
{ description = "Update nixos.org Homepage";
287
- path = [ config.nix.package pkgs.git pkgs.bash ];
278
+ # FIXME: gnutar/xz deps work around a Nix bug.
279
+ path = [ config.nix.package pkgs.git pkgs.bash pkgs.gnutar pkgs.xz ];
280
serviceConfig.User = "eelco";
289
- environment.NIX_PATH = "/nix/var/nix/profiles/per-user/root/channels/nixos";
281
+ environment.NIX_PATH = concatStringsSep ":" config.nix.nixPath;
282
environment.NIX_REMOTE = "daemon";
283
environment.CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt";
284
serviceConfig.Type = "oneshot";