summaryrefslogtreecommitdiffstats
path: root/tv/1systems/xu.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-06-30 09:16:10 +0200
committerlassulus <lass@aidsballs.de>2016-06-30 09:16:10 +0200
commit7550c663112c5a59e7c760c4b96c9bcc919fb175 (patch)
tree66ba4ef196bf81449a6a9ce26da23fc9eb77b353 /tv/1systems/xu.nix
parentf12578c66f8b7b829c0dec5255f358778c0d3366 (diff)
parent0c7a44139fba572487fe853310b6d88a6ffa21c3 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/1systems/xu.nix')
-rw-r--r--tv/1systems/xu.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index 6ba7ab327..7277f5cb7 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -49,7 +49,7 @@ with config.krebs.lib;
cac-api
dic
file
- gnupg21
+ gnupg1compat
haskellPackages.hledger
htop
jq
@@ -163,7 +163,7 @@ with config.krebs.lib;
environment.systemPackages = with pkgs; [
ethtool
- tinc
+ tinc_pre
iptables
#jack2