diff options
author | makefu <github@syntax-fehler.de> | 2018-05-31 10:39:49 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2018-05-31 10:39:49 +0200 |
commit | 10deb114affc296224df59a5e4a3161101548613 (patch) | |
tree | cdb0aec231ee0d5354003e6d0d2d4df38db22f82 /tv | |
parent | 319bb6fa89e24d0da9eca1b9d69c685b95f329f0 (diff) | |
parent | 4277c251906100bc103808af7a674fe2fbb3851b (diff) |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'tv')
-rw-r--r-- | tv/2configs/gitrepos.nix | 2 | ||||
-rw-r--r-- | tv/source.nix | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix index c3418e7ee..a4e3aafca 100644 --- a/tv/2configs/gitrepos.nix +++ b/tv/2configs/gitrepos.nix @@ -42,7 +42,7 @@ let { kirk = { cgit.desc = "IRC tools"; }; - kops = { + krops = { cgit.desc = "deployment tools"; }; load-env = {}; diff --git a/tv/source.nix b/tv/source.nix index e5e5e0413..14527d956 100644 --- a/tv/source.nix +++ b/tv/source.nix @@ -16,8 +16,7 @@ in { nixos-config.symlink = "stockholm/tv/1systems/${name}/config.nix"; nixpkgs.git = { - # nixos-17.09 - ref = mkDefault "53e6d671a9662922080635482b7e1c418d2cdc72"; + ref = mkDefault "7cbf6ca1c84dfc917c1a99524e082fb677501844"; url = https://github.com/NixOS/nixpkgs; }; secrets.file = getAttr builder { |