diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-09-12 22:49:43 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-09-12 22:49:43 +0200 |
| commit | a441eaa7b16ee0e264f74303ef36e37ecb3fe9dc (patch) | |
| tree | c8dee9fa804b516d2447f816359e8f15b3d85110 /pkgs/tools/security | |
| parent | 20c7a35429c4882227f1fb9788aeebc7c12726bf (diff) | |
| parent | 7d39ecdf58cc000013e4bf05d9c2f32ab4bf93a7 (diff) | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/bitwarden/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/security/keybase/gui.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/security/lesspass-cli/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/security/metasploit/default.nix | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index d94e02c4adc..c67cc447431 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -51,7 +51,7 @@ let dontBuild = true; dontConfigure = true; - dontPatchElf = true; + dontPatchELF = true; dontWrapGApps = true; buildInputs = [ libsecret ] ++ atomEnv.packages; diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 3954ec818b1..944e73dd46c 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { dontBuild = true; dontConfigure = true; - dontPatchElf = true; + dontPatchELF = true; unpackPhase = '' ar xf $src diff --git a/pkgs/tools/security/lesspass-cli/default.nix b/pkgs/tools/security/lesspass-cli/default.nix index afcdf0c0a07..76732170079 100644 --- a/pkgs/tools/security/lesspass-cli/default.nix +++ b/pkgs/tools/security/lesspass-cli/default.nix @@ -2,14 +2,15 @@ let inherit (python3.pkgs) buildPythonApplication pytest mock pexpect; + repo = "lesspass"; in buildPythonApplication rec { pname = "lesspass-cli"; version = "9.0.0"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = repo; + repo = repo; rev = version; sha256 = "1mdv0c0fn4d72iigy8hz4s7kf7q3pg4gjjadxwxyjwsalapnsapk"; }; diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 8b67e90f415..8486f10bab0 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; - dontPatchelf = true; # stay away from exploit executables + dontPatchELF = true; # stay away from exploit executables installPhase = '' mkdir -p $out/{bin,share/msf} |