diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2020-12-04 18:14:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-04 18:14:51 +0000 |
| commit | cb36dd7449c2cd8ed0d9c9946a3ffe0460a742b1 (patch) | |
| tree | abe3563a0bfd150dd72db39d0b1def08b359c74e /pkgs/tools/security | |
| parent | 5524c43f2c0cc246de33d6eff378dcad843b2617 (diff) | |
| parent | b66ea6fc39acc588ecc8ccb1409995f2444862df (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/pass/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/security/pass/extensions/audit/default.nix | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 9ba03fc74a2f..9e9348105010 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, pkgs, fetchurl, buildEnv -, coreutils, gnused, getopt, git, tree, gnupg, openssl, which, procps -, qrencode , makeWrapper, pass, symlinkJoin +, coreutils, findutils, gnugrep, gnused, getopt, git, tree, gnupg, openssl +, which, procps , qrencode , makeWrapper, pass, symlinkJoin , xclip ? null, xdotool ? null, dmenu ? null , x11Support ? !stdenv.isDarwin , dmenuSupport ? x11Support @@ -80,8 +80,10 @@ stdenv.mkDerivation rec { wrapperPath = with stdenv.lib; makeBinPath ([ coreutils + findutils getopt git + gnugrep gnupg gnused tree diff --git a/pkgs/tools/security/pass/extensions/audit/default.nix b/pkgs/tools/security/pass/extensions/audit/default.nix index 144d13238f26..ec0f23ddc383 100644 --- a/pkgs/tools/security/pass/extensions/audit/default.nix +++ b/pkgs/tools/security/pass/extensions/audit/default.nix @@ -30,7 +30,8 @@ in stdenv.mkDerivation rec { buildInputs = [ pythonEnv ]; nativeBuildInputs = [ makeWrapper ]; - doCheck = true; + # Tests freeze on darwin with: pass-audit-1.1 (checkPhase): EOFError + doCheck = !stdenv.isDarwin; checkInputs = [ pythonPackages.green pass gnupg ]; checkPhase = '' ${pythonEnv}/bin/python3 setup.py green -q |