summaryrefslogtreecommitdiffstats
path: root/tv/2configs
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-11-10 20:59:58 +0100
committerlassulus <lass@aidsballs.de>2016-11-10 20:59:58 +0100
commit221d4f4fd1bdd0e8e7131b0333a83503a68a014f (patch)
tree921a183dbe1442e3b9d244fb191a13acb7712886 /tv/2configs
parent50a56a14f7eacbc492177a33a7efb0e144863223 (diff)
parent9ae96685ec9ccadb84a5a7034d1fc627c95d94ec (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/2configs')
-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 514d313c1..dbf311479 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 = "238c7e0dbf73d7f330689cb6ec4b1218526cee4e";
+ ref = "1e1112edc57e93046f35707b874d2a4f3ff321e6";
};
} // optionalAttrs host.secure {
secrets-master.file = "/home/tv/secrets/master";
[cgit] Unable to lock slot /tmp/cgit/3d200000.lock: No such file or directory (2)