summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-10-16 23:21:19 +0200
committermakefu <github@syntax-fehler.de>2015-10-16 23:21:19 +0200
commit9da82f7bc6341207fe07a35335bd877a799b4f56 (patch)
treef070749ac24742ffa2b47484adb0ab8ad0431d81 /tv
parent4d7bb2475f13730f238e854783b81b7609cfdcba (diff)
parent4c6635f2c1e6b046155009afb455e4458e196100 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv')
-rw-r--r--tv/1systems/mkdir.nix2
-rw-r--r--tv/1systems/wu.nix1
-rw-r--r--tv/2configs/git.nix1
3 files changed, 3 insertions, 1 deletions
diff --git a/tv/1systems/mkdir.nix b/tv/1systems/mkdir.nix
index 76432ba03..669dcc2f3 100644
--- a/tv/1systems/mkdir.nix
+++ b/tv/1systems/mkdir.nix
@@ -24,7 +24,7 @@ in
krebs.build.source = {
git.nixpkgs = {
url = https://github.com/NixOS/nixpkgs;
- rev = "68bd8e4a9dc247726ae89cc8739574261718e328";
+ rev = "e57024f821c94caf5684964474073649b8b6356b";
};
dir.secrets = {
host = config.krebs.hosts.wu;
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index 0ef846f93..cc99b0498 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -89,6 +89,7 @@ with lib;
pavucontrol
posix_man_pages
pssh
+ push
qrencode
sxiv
texLive
diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix
index 401cf5f4d..d782c87f1 100644
--- a/tv/2configs/git.nix
+++ b/tv/2configs/git.nix
@@ -35,6 +35,7 @@ let
nixos-infest = {};
nixpkgs = {};
painload = {};
+ push = {};
quipper = {};
regfish = {};
stockholm = {