diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-02 00:04:43 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-02 00:04:43 +0000 |
| commit | e879e7d54ee09c8bc8726d40ea2d31e8efdf93b5 (patch) | |
| tree | 9662884a7112c2a23a1ed52e775896182f967c11 /pkgs/tools/security | |
| parent | aecf7c7bb9d978330ef40b0179fd25fb7f02d7b4 (diff) | |
| parent | ae1d03834ebe4881dca31da399e277657ba33779 (diff) | |
| download | nixpkgs-e879e7d54ee09c8bc8726d40ea2d31e8efdf93b5.tar nixpkgs-e879e7d54ee09c8bc8726d40ea2d31e8efdf93b5.tar.gz nixpkgs-e879e7d54ee09c8bc8726d40ea2d31e8efdf93b5.tar.bz2 nixpkgs-e879e7d54ee09c8bc8726d40ea2d31e8efdf93b5.tar.lz nixpkgs-e879e7d54ee09c8bc8726d40ea2d31e8efdf93b5.tar.xz nixpkgs-e879e7d54ee09c8bc8726d40ea2d31e8efdf93b5.tar.zst nixpkgs-e879e7d54ee09c8bc8726d40ea2d31e8efdf93b5.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/gnupg/23.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/security/gowitness/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/tools/security/iaito/default.nix | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/tools/security/gnupg/23.nix b/pkgs/tools/security/gnupg/23.nix index af28b4903df..cb11e9f7eab 100644 --- a/pkgs/tools/security/gnupg/23.nix +++ b/pkgs/tools/security/gnupg/23.nix @@ -2,7 +2,8 @@ , libgpg-error, libiconv, npth, gettext, texinfo, buildPackages , guiSupport ? stdenv.isDarwin, enableMinimal ? false , adns, bzip2, gnutls, libusb1, openldap -, tpm2-tss, pcsclite, pinentry, readline, sqlite, zlib +, tpm2-tss, pinentry, readline, sqlite, zlib +, withPcsc ? !enableMinimal, pcsclite }: assert guiSupport -> enableMinimal == false; @@ -43,7 +44,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' sed -i 's,\(hkps\|https\)://keyserver.ubuntu.com,hkps://keys.openpgp.org,g' configure configure.ac doc/dirmngr.texi doc/gnupg.info-1 - '' + lib.optionalString (stdenv.isLinux && (!enableMinimal)) '' + '' + lib.optionalString (stdenv.isLinux && withPcsc) '' sed -i 's,"libpcsclite\.so[^"]*","${lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c ''; diff --git a/pkgs/tools/security/gowitness/default.nix b/pkgs/tools/security/gowitness/default.nix index ef0d25783c0..80bc40f450e 100644 --- a/pkgs/tools/security/gowitness/default.nix +++ b/pkgs/tools/security/gowitness/default.nix @@ -1,20 +1,19 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gowitness"; - version = "2.4.0"; + version = "2.4.2"; src = fetchFromGitHub { owner = "sensepost"; repo = pname; rev = version; - hash = "sha256-6O4pGsUu9tG3VAIGaD9aauXaVMhvK+HpEjByE0AwVnE="; + sha256 = "sha256-e4J+W5VHVy/ngC5FDsDBStIaIR7jODWPt8VGTfAse44="; }; - vendorSha256 = "sha256-6FgYDiz050ZlC1XBz7dKkVFKY7gkGhIm0ND23tMwxC8="; + vendorSha256 = "sha256-NFQbulW07sljskjLn6A4f+PMMCJxploYqAHE+K7XxH8="; + + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "Web screenshot utility"; diff --git a/pkgs/tools/security/iaito/default.nix b/pkgs/tools/security/iaito/default.nix index cd45f9a58b6..b3b1b805c5d 100644 --- a/pkgs/tools/security/iaito/default.nix +++ b/pkgs/tools/security/iaito/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "iaito"; - version = "5.7.4"; + version = "5.7.6"; src = fetchFromGitHub { owner = "radareorg"; repo = pname; rev = version; - sha256 = "sha256-T9+YQQDcXHFogD7FVkippsde7+0bKodwwABCqrKjcH4="; + sha256 = "sha256-PnIOoWPYLK30lMmLVctihCs7GBo0rTN8yetWAr21h9w="; }; nativeBuildInputs = [ meson ninja pkg-config python3 qttools wrapQtAppsHook ]; |