From 0c7a44139fba572487fe853310b6d88a6ffa21c3 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 30 Jun 2016 01:34:25 +0200 Subject: xu,wu: s/gnupg21/gnupg1compat+&/ --- tv/1systems/wu.nix | 2 +- tv/1systems/xu.nix | 2 +- tv/5pkgs/default.nix | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'tv') diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix index 6bb54437..d115e274 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 a3a242c4..7277f5cb 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 60798080..affb535e 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; }; -- cgit v1.2.3