diff options
author | lassulus <lass@lassul.us> | 2017-03-05 00:26:56 +0100 |
---|---|---|
committer | lassulus <lass@lassul.us> | 2017-03-05 00:26:56 +0100 |
commit | abdfd8269f3eb97d0feecd9fab1c622ebd56403c (patch) | |
tree | ffea19187190a105e7b0caf617a0215c02c281da /tv | |
parent | 39fd77b84c7c14d6460722721726b378bdab7acd (diff) | |
parent | d7761aed6559adba3cfa61d822165c42c90fc276 (diff) |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv')
-rw-r--r-- | tv/2configs/default.nix | 2 | ||||
-rw-r--r-- | tv/2configs/urlwatch.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 1d3ee3980..33fb7e492 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -14,7 +14,7 @@ with import <stockholm/lib>; stockholm.file = "/home/tv/stockholm"; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "53a2baa"; # nixos-unstable (17.03-rc) + ref = "5b0c9d4f92f15f171afa65caf13a29ac1c068a10"; # nixos-17.03 }; } // optionalAttrs host.secure { secrets-master.file = "/home/tv/secrets/master"; diff --git a/tv/2configs/urlwatch.nix b/tv/2configs/urlwatch.nix index 6e11e0251..5779240ba 100644 --- a/tv/2configs/urlwatch.nix +++ b/tv/2configs/urlwatch.nix @@ -31,7 +31,7 @@ with import <stockholm/lib>; ## other - https://nixos.org/channels/nixos-16.09/git-revision + https://nixos.org/channels/nixos-17.03/git-revision https://nixos.org/channels/nixos-unstable/git-revision ## 2014-10-17 |