diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-03-03 16:36:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-03 16:36:41 +0000 |
| commit | da3b11c1cd7cfb471e91894b157037023e65c9cf (patch) | |
| tree | b504901d54a72bb2ec936135360b16d1e0899abc /pkgs/tools/security/pass | |
| parent | 9936ed4920974c558eded168d2e36e726bd56b11 (diff) | |
| parent | f4d1d269faa634482ee13f75b66a16a00aa0a8d6 (diff) | |
| download | nixpkgs-da3b11c1cd7cfb471e91894b157037023e65c9cf.tar nixpkgs-da3b11c1cd7cfb471e91894b157037023e65c9cf.tar.gz nixpkgs-da3b11c1cd7cfb471e91894b157037023e65c9cf.tar.bz2 nixpkgs-da3b11c1cd7cfb471e91894b157037023e65c9cf.tar.lz nixpkgs-da3b11c1cd7cfb471e91894b157037023e65c9cf.tar.xz nixpkgs-da3b11c1cd7cfb471e91894b157037023e65c9cf.tar.zst nixpkgs-da3b11c1cd7cfb471e91894b157037023e65c9cf.zip | |
Merge pull request #29307 from mickours/pass-tomb-plugin
(pass): Add tomb plugin
Diffstat (limited to 'pkgs/tools/security/pass')
| -rw-r--r-- | pkgs/tools/security/pass/default.nix | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 24922db2e77..ad2afa8ed91 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -4,6 +4,7 @@ , xclip ? null, xdotool ? null, dmenu ? null , x11Support ? !stdenv.isDarwin +, tombPluginSupport ? false, tomb }: with lib; @@ -17,10 +18,19 @@ let owner = "roddhjav"; repo = "pass-${p.name}"; inherit (p) rev sha256; - })) [ - { name = "import"; rev = "491935bd275f29ceac2b876b3a288011d1ce31e7"; sha256 = "02mbh05ab8h7kc30hz718d1d1vkjz43b96c7p0xnd92610d2q66q"; } - { name = "update"; rev = "cf576c9036fd18efb9ed29e0e9f811207b556fde"; sha256 = "1hhbrg6a2walrvla6q4cd3pgrqbcrf9brzjkb748735shxfn52hd"; } - ]; + })) + ([ + { name = "import"; + rev = "491935bd275f29ceac2b876b3a288011d1ce31e7"; + sha256 = "02mbh05ab8h7kc30hz718d1d1vkjz43b96c7p0xnd92610d2q66q"; } + { name = "update"; + rev = "cf576c9036fd18efb9ed29e0e9f811207b556fde"; + sha256 = "1hhbrg6a2walrvla6q4cd3pgrqbcrf9brzjkb748735shxfn52hd"; } + ] ++ stdenv.lib.optional tombPluginSupport { + name = "tomb"; + rev = "3368134898a42c1b758fabac625ec240e125c6be"; + sha256 = "0qqmxfg4w3r088qhlkhs44036mya82vjflsjjhw2hk8y0wd2i6ds"; } + ); in stdenv.mkDerivation rec { version = "1.7.1"; @@ -64,7 +74,8 @@ in stdenv.mkDerivation rec { tree which qrencode - ] ++ stdenv.lib.optional stdenv.isLinux procps + ] ++ optional tombPluginSupport tomb + ++ optional stdenv.isLinux procps ++ ifEnable x11Support [ dmenu xclip xdotool ]); postFixup = '' |