diff options
author | makefu <github@syntax-fehler.de> | 2018-04-04 15:23:44 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2018-04-04 15:23:44 +0200 |
commit | 3ed84b0b8c063a294e7cb40a786fa7a15ee0e5a4 (patch) | |
tree | 569658ceb8fc90f640d7ce48357eb84a0383b494 /tv/2configs | |
parent | 1b740bf9ef32972f7242226699a75b39feeb18b2 (diff) | |
parent | 1a5b58c828409ce9bf1639f3f26ebeb142e0148a (diff) |
Merge remote-tracking branch 'lass/staging/18.03' into staging
Diffstat (limited to 'tv/2configs')
-rw-r--r-- | tv/2configs/urlwatch.nix | 5 | ||||
-rw-r--r-- | tv/2configs/xserver/default.nix | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/tv/2configs/urlwatch.nix b/tv/2configs/urlwatch.nix index 509257c48..897def8c9 100644 --- a/tv/2configs/urlwatch.nix +++ b/tv/2configs/urlwatch.nix @@ -13,11 +13,6 @@ with import <stockholm/lib>; http://www.exim.org/ - { - url = https://api.github.com/repos/Gabriel439/nix-diff/git/refs/heads/master; - filter = "system:${pkgs.jq}/bin/jq -r .object.sha"; - } - # ref src/nixpkgs/pkgs/tools/admin/sec/default.nix { url = https://api.github.com/repos/simple-evcorr/sec/tags; diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix index 7ba78b974..6ef8a8768 100644 --- a/tv/2configs/xserver/default.nix +++ b/tv/2configs/xserver/default.nix @@ -11,6 +11,7 @@ in { environment.systemPackages = [ pkgs.ff + pkgs.font-size pkgs.gitAndTools.qgit pkgs.mpv pkgs.sxiv |