summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-06-30 01:34:25 +0200
committertv <tv@krebsco.de>2016-06-30 01:34:25 +0200
commit0c7a44139fba572487fe853310b6d88a6ffa21c3 (patch)
tree00fe60ee0ad2e2610a80e03c692c69a3514e8c05 /tv
parentc275ae7523b36e03019c18f3b99248bd04af875d (diff)
xu,wu: s/gnupg21/gnupg1compat+&/
Diffstat (limited to 'tv')
-rw-r--r--tv/1systems/wu.nix2
-rw-r--r--tv/1systems/xu.nix2
-rw-r--r--tv/5pkgs/default.nix4
3 files changed, 6 insertions, 2 deletions
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index 6bb544371..d115e274b 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -38,7 +38,7 @@ with config.krebs.lib;
dic
file
get
- gnupg21
+ gnupg1compat
haskellPackages.hledger
htop
jq
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index a3a242c46..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
diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index 607980807..affb535ef 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -16,6 +16,10 @@
erlang = pkgs.erlangR16;
};
ff = pkgs.callPackage ./ff {};
+ gnupg =
+ if elem config.krebs.build.host.name ["xu" "wu"]
+ then super.gnupg21
+ else super.gnupg;
q = pkgs.callPackage ./q {};
viljetic-pages = pkgs.callPackage ./viljetic-pages {};
xmonad-tv = import ./xmonad-tv.nix { inherit pkgs; };