summaryrefslogtreecommitdiffstats
path: root/tv/2configs/default.nix
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-04-17 13:15:13 +0200
committermakefu <github@syntax-fehler.de>2017-04-17 13:15:13 +0200
commit35c7e1c37545dd96c90d54191ba835eb0ceeac8e (patch)
tree65db0a2d770654f555fcac74c8e457261054df5d /tv/2configs/default.nix
parent9d7e9bf4a9630bb763d7d7bff7880c70405c7ea3 (diff)
parentb6a4df7e398c7b4d7dc4f56d2eded22a79fee30f (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'tv/2configs/default.nix')
-rw-r--r--tv/2configs/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 618dcdccb..cbbd5c439 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 = "69d9061908162bd973fcf34d0fc6dc9d9f8cf9ed"; # nixos-17.03
+ ref = "5acb454e2ad3e3783e63b86a9a31e800d2507e66"; # nixos-17.03
};
} // optionalAttrs host.secure {
secrets-master.file = "/home/tv/secrets/master";
[cgit] Unable to lock slot /tmp/cgit/89100000.lock: No such file or directory (2)