diff options
37 files changed, 26 insertions, 74 deletions
diff --git a/pkgs/tools/security/adenum/default.nix b/pkgs/tools/security/adenum/default.nix index 24d318968ad8..018fd0e263fc 100644 --- a/pkgs/tools/security/adenum/default.nix +++ b/pkgs/tools/security/adenum/default.nix @@ -1,11 +1,10 @@ { lib -, stdenv , fetchFromGitHub , john , python3 }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication { pname = "adenum"; version = "unstable-2022-04-01"; format = "other"; diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix index 6102eb0b3f39..a63f80c68ad1 100644 --- a/pkgs/tools/security/aflplusplus/default.nix +++ b/pkgs/tools/security/aflplusplus/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, stdenvNoCC, fetchFromGitHub, callPackage, makeWrapper , clang, llvm, gcc, which, libcgroup, python3, perl, gmp -, file, wine ? null, fetchpatch +, file, wine ? null , cmocka , llvmPackages }: @@ -11,7 +11,7 @@ assert (wine != null) -> (stdenv.targetPlatform.system == "i686-linux"); let - aflplusplus-qemu = callPackage ./qemu.nix { inherit aflplusplus; }; + aflplusplus-qemu = callPackage ./qemu.nix { }; qemu-exe-name = if stdenv.targetPlatform.system == "x86_64-linux" then "qemu-x86_64" else if stdenv.targetPlatform.system == "i686-linux" then "qemu-i386" else throw "aflplusplus: no support for ${stdenv.targetPlatform.system}!"; diff --git a/pkgs/tools/security/aflplusplus/qemu.nix b/pkgs/tools/security/aflplusplus/qemu.nix index 6be5afb54dc3..89e537766ddb 100644 --- a/pkgs/tools/security/aflplusplus/qemu.nix +++ b/pkgs/tools/security/aflplusplus/qemu.nix @@ -1,7 +1,5 @@ { lib , stdenv -, fetchurl -, aflplusplus , python3 , zlib , pkg-config @@ -19,10 +17,6 @@ let qemuName = "qemu-5.2.50"; - cpuTarget = - if stdenv.targetPlatform.system == "x86_64-linux" then "x86_64-linux-user" - else if stdenv.targetPlatform.system == "i686-linux" then "i386-linux-user" - else throw "aflplusplus: no support for ${stdenv.targetPlatform.system}!"; in stdenv.mkDerivation { name = "aflplusplus-${qemuName}"; diff --git a/pkgs/tools/security/bao/default.nix b/pkgs/tools/security/bao/default.nix index 01941f54f36e..f948bccc5f43 100644 --- a/pkgs/tools/security/bao/default.nix +++ b/pkgs/tools/security/bao/default.nix @@ -1,7 +1,6 @@ { lib -, fetchCrate -, fetchpatch , rustPlatform +, fetchCrate }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/tools/security/cirrusgo/default.nix b/pkgs/tools/security/cirrusgo/default.nix index 56fb7c71b1ec..9d94d3b7542f 100644 --- a/pkgs/tools/security/cirrusgo/default.nix +++ b/pkgs/tools/security/cirrusgo/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub }: diff --git a/pkgs/tools/security/davtest/default.nix b/pkgs/tools/security/davtest/default.nix index d4a7b6068c55..226ead57ffde 100644 --- a/pkgs/tools/security/davtest/default.nix +++ b/pkgs/tools/security/davtest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, perl, perlPackages, fetchurl }: +{ lib, stdenv, perl, fetchurl }: stdenv.mkDerivation rec { pname = "davtest"; diff --git a/pkgs/tools/security/evtx/default.nix b/pkgs/tools/security/evtx/default.nix index 86cd382576df..e12408d22752 100644 --- a/pkgs/tools/security/evtx/default.nix +++ b/pkgs/tools/security/evtx/default.nix @@ -1,7 +1,6 @@ { lib -, stdenv -, fetchFromGitHub , rustPlatform +, fetchFromGitHub }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index 472334f4a6ff..27425b1a1491 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -7,12 +7,10 @@ , ninja , perl , gettext -, cairo , gtk-doc , libxslt , docbook-xsl-nons , docbook_xml_dtd_412 -, fetchurl , glib , gusb , dbus diff --git a/pkgs/tools/security/gallia/default.nix b/pkgs/tools/security/gallia/default.nix index bb62b9403cff..f0e71f8c9c05 100644 --- a/pkgs/tools/security/gallia/default.nix +++ b/pkgs/tools/security/gallia/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , python3 , cacert diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix index 9f705b1c12a0..7ff9fe994756 100644 --- a/pkgs/tools/security/ghidra/build.nix +++ b/pkgs/tools/security/ghidra/build.nix @@ -1,6 +1,4 @@ { stdenv -, fetchzip -, fetchurl , fetchFromGitHub , lib , gradle_7 @@ -9,11 +7,9 @@ , openjdk17 , unzip , makeDesktopItem -, autoPatchelfHook , icoutils , xcbuild , protobuf -, libredirect }: let @@ -116,7 +112,7 @@ HERE outputHash = "sha256-HveS3f8XHpJqefc4djYmnYfd01H2OBFK5PLNOsHAqlc="; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit pname version src; nativeBuildInputs = [ diff --git a/pkgs/tools/security/grap/default.nix b/pkgs/tools/security/grap/default.nix index a0572758aae6..1d77e9bf99cb 100644 --- a/pkgs/tools/security/grap/default.nix +++ b/pkgs/tools/security/grap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, boost, libseccomp, flex, python3Packages, swig4, bison, cmake, python3 }: +{ lib, stdenv, fetchFromGitHub, boost, libseccomp, flex, swig4, bison, cmake, python3 }: stdenv.mkDerivation rec { pname = "grap"; diff --git a/pkgs/tools/security/honggfuzz/default.nix b/pkgs/tools/security/honggfuzz/default.nix index 47090b261f77..3885316271b9 100644 --- a/pkgs/tools/security/honggfuzz/default.nix +++ b/pkgs/tools/security/honggfuzz/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, callPackage , makeWrapper , clang , llvm diff --git a/pkgs/tools/security/ike-scan/default.nix b/pkgs/tools/security/ike-scan/default.nix index 15d201fa3270..3c6374cab9a3 100644 --- a/pkgs/tools/security/ike-scan/default.nix +++ b/pkgs/tools/security/ike-scan/default.nix @@ -1,6 +1,4 @@ { lib -, autoconf -, automake , autoreconfHook , fetchFromGitHub , fetchpatch diff --git a/pkgs/tools/security/ioccheck/default.nix b/pkgs/tools/security/ioccheck/default.nix index 6b1c4bc8e341..fc457e0c7fd4 100644 --- a/pkgs/tools/security/ioccheck/default.nix +++ b/pkgs/tools/security/ioccheck/default.nix @@ -6,7 +6,7 @@ let py = python3.override { packageOverrides = self: super: { - emoji = super.emoji.overridePythonAttrs (oldAttrs: rec { + emoji = super.emoji.overridePythonAttrs rec { version = "1.7.0"; src = fetchFromGitHub { @@ -15,11 +15,11 @@ let rev = "v${version}"; sha256 = "sha256-vKQ51RP7uy57vP3dOnHZRSp/Wz+YDzeLUR8JnIELE/I="; }; - }); + }; # Support for later tweepy releases is missing # https://github.com/ranguli/ioccheck/issues/70 - tweepy = super.tweepy.overridePythonAttrs (oldAttrs: rec { + tweepy = super.tweepy.overridePythonAttrs rec { version = "3.10.0"; src = fetchFromGitHub { @@ -29,7 +29,7 @@ let sha256 = "0k4bdlwjna6f1k19jki4xqgckrinkkw8b9wihzymr1l04rwd05nw"; }; doCheck = false; - }); + }; }; }; in diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix index d49d5289c44c..6d970dca9519 100644 --- a/pkgs/tools/security/jwt-cli/default.nix +++ b/pkgs/tools/security/jwt-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "jwt-cli"; diff --git a/pkgs/tools/security/keybase/kbfs.nix b/pkgs/tools/security/keybase/kbfs.nix index 71368e35d5e1..aad08d1a3994 100644 --- a/pkgs/tools/security/keybase/kbfs.nix +++ b/pkgs/tools/security/keybase/kbfs.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, keybase }: +{ lib, buildGoModule, keybase }: buildGoModule { pname = "kbfs"; diff --git a/pkgs/tools/security/networkminer/default.nix b/pkgs/tools/security/networkminer/default.nix index c9c6c528cbc4..6e762ef543fe 100644 --- a/pkgs/tools/security/networkminer/default.nix +++ b/pkgs/tools/security/networkminer/default.nix @@ -3,7 +3,6 @@ , fetchurl , unzip , dos2unix -, makeWrapper , msbuild , mono }: diff --git a/pkgs/tools/security/noseyparker/default.nix b/pkgs/tools/security/noseyparker/default.nix index e5f47569fbc8..c6e4056d9fab 100644 --- a/pkgs/tools/security/noseyparker/default.nix +++ b/pkgs/tools/security/noseyparker/default.nix @@ -1,7 +1,6 @@ { lib , rustPlatform , fetchFromGitHub -, stdenv , cmake , pkg-config , openssl diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix index 9b6bcf74739b..7666e86e0120 100644 --- a/pkgs/tools/security/onioncircuits/default.nix +++ b/pkgs/tools/security/onioncircuits/default.nix @@ -2,9 +2,7 @@ , lib , fetchFromGitLab , fetchpatch -, gnome , gobject-introspection -, gtk3 , intltool , python3 , wrapGAppsHook diff --git a/pkgs/tools/security/onlykey/default.nix b/pkgs/tools/security/onlykey/default.nix index d924e7ccc3a4..018c53b0c083 100644 --- a/pkgs/tools/security/onlykey/default.nix +++ b/pkgs/tools/security/onlykey/default.nix @@ -1,6 +1,4 @@ -{ fetchgit -, lib -, makeDesktopItem +{ lib , node_webkit , pkgs , runCommand @@ -25,10 +23,10 @@ let # define a shortcut to get to onlykey. onlykey = self."${onlykeyPkg}"; - super = (import ./onlykey.nix { + super = import ./onlykey.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; - }); + }; self = super // { "${onlykeyPkg}" = super."${onlykeyPkg}".override (attrs: { @@ -48,14 +46,6 @@ let script = writeShellScript "${onlykey.packageName}-starter-${onlykey.version}" '' ${node_webkit}/bin/nw ${onlykey}/lib/node_modules/${onlykey.packageName}/build ''; - - desktop = makeDesktopItem { - name = onlykey.packageName; - exec = script; - icon = "${onlykey}/lib/node_modules/${onlykey.packageName}/resources/onlykey_logo_128.png"; - desktopName = onlykey.packageName; - genericName = onlykey.packageName; - }; in runCommand "${onlykey.packageName}-${onlykey.version}" { } '' mkdir -p $out/bin diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 498e715a8ebf..1b840999e6af 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, findutils, gnugrep, gnused, getopt, git, tree, gnupg, openssl -, which, openssh, procps, qrencode, makeWrapper, pass, symlinkJoin +, which, openssh, procps, qrencode, makeWrapper, pass , xclip ? null, xdotool ? null, dmenu ? null , x11Support ? !stdenv.isDarwin , dmenuSupport ? (x11Support || waylandSupport) diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix index ad2d2a7156ae..8c51356e184b 100644 --- a/pkgs/tools/security/pass/extensions/import.nix +++ b/pkgs/tools/security/pass/extensions/import.nix @@ -4,7 +4,6 @@ , python3Packages , gnupg , pass -, makeWrapper }: python3Packages.buildPythonApplication rec { diff --git a/pkgs/tools/security/passage/default.nix b/pkgs/tools/security/passage/default.nix index df3bd95d966b..e2570c2adf4b 100644 --- a/pkgs/tools/security/passage/default.nix +++ b/pkgs/tools/security/passage/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , makeBinaryWrapper , substituteAll -, bash , age , getopt , git ? null diff --git a/pkgs/tools/security/pcsc-safenet/default.nix b/pkgs/tools/security/pcsc-safenet/default.nix index 2fcbd302e8cc..27d3c639ac8e 100644 --- a/pkgs/tools/security/pcsc-safenet/default.nix +++ b/pkgs/tools/security/pcsc-safenet/default.nix @@ -1,13 +1,11 @@ { stdenv , lib -, runCommand , fetchzip , autoPatchelfHook , dpkg , gtk3 , openssl_1_1 , pcsclite -, unzip }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/security/quill/default.nix b/pkgs/tools/security/quill/default.nix index a879e9ba4810..b2a4f3528d56 100644 --- a/pkgs/tools/security/quill/default.nix +++ b/pkgs/tools/security/quill/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, openssl, Security, libiconv, pkg-config, protobuf, which, buildPackages }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, openssl, Security, libiconv, pkg-config, protobuf, buildPackages }: rustPlatform.buildRustPackage rec { pname = "quill"; diff --git a/pkgs/tools/security/ripasso/cursive.nix b/pkgs/tools/security/ripasso/cursive.nix index ab2498980f69..b3e8274b450c 100644 --- a/pkgs/tools/security/ripasso/cursive.nix +++ b/pkgs/tools/security/ripasso/cursive.nix @@ -2,7 +2,6 @@ , lib , rustPlatform , fetchFromGitHub -, fetchpatch , pkg-config , python3 , openssl @@ -10,7 +9,6 @@ , gpgme , xorg , nettle -, llvmPackages , clang , AppKit , Security diff --git a/pkgs/tools/security/ruler/default.nix b/pkgs/tools/security/ruler/default.nix index b6505533aa82..6389c0eac041 100644 --- a/pkgs/tools/security/ruler/default.nix +++ b/pkgs/tools/security/ruler/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub }: diff --git a/pkgs/tools/security/schleuder/default.nix b/pkgs/tools/security/schleuder/default.nix index 84597f6f51bf..97173fdc3e19 100644 --- a/pkgs/tools/security/schleuder/default.nix +++ b/pkgs/tools/security/schleuder/default.nix @@ -2,7 +2,6 @@ , bundlerApp , ruby , bundlerUpdateScript -, defaultGemConfig , nixosTests }: diff --git a/pkgs/tools/security/scorecard/default.nix b/pkgs/tools/security/scorecard/default.nix index 4c9ca6bc1bba..48a88df63502 100644 --- a/pkgs/tools/security/scorecard/default.nix +++ b/pkgs/tools/security/scorecard/default.nix @@ -1,7 +1,6 @@ { lib , buildGoModule , fetchFromGitHub -, fetchgit , installShellFiles , testers , scorecard diff --git a/pkgs/tools/security/sequoia-sqop/default.nix b/pkgs/tools/security/sequoia-sqop/default.nix index b071c82597f0..f4cae90b546b 100644 --- a/pkgs/tools/security/sequoia-sqop/default.nix +++ b/pkgs/tools/security/sequoia-sqop/default.nix @@ -1,6 +1,5 @@ -{ stdenv +{ lib , fetchFromGitLab -, lib , nettle , nix-update-script , installShellFiles diff --git a/pkgs/tools/security/sequoia-sqv/default.nix b/pkgs/tools/security/sequoia-sqv/default.nix index b09002602575..b85c5d2cfb18 100644 --- a/pkgs/tools/security/sequoia-sqv/default.nix +++ b/pkgs/tools/security/sequoia-sqv/default.nix @@ -1,6 +1,5 @@ -{ stdenv +{ lib , fetchFromGitLab -, lib , nettle , nix-update-script , rustPlatform diff --git a/pkgs/tools/security/step-kms-plugin/default.nix b/pkgs/tools/security/step-kms-plugin/default.nix index 28d59054f205..45777340f7c8 100644 --- a/pkgs/tools/security/step-kms-plugin/default.nix +++ b/pkgs/tools/security/step-kms-plugin/default.nix @@ -7,7 +7,7 @@ , softhsm , opensc , yubihsm-shell -, writeScriptBin }: +}: buildGoModule rec { pname = "step-kms-plugin"; diff --git a/pkgs/tools/security/sx-go/default.nix b/pkgs/tools/security/sx-go/default.nix index 1df508386208..c49ed42dcc1e 100644 --- a/pkgs/tools/security/sx-go/default.nix +++ b/pkgs/tools/security/sx-go/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildGoModule , fetchFromGitHub , fetchpatch diff --git a/pkgs/tools/security/traitor/default.nix b/pkgs/tools/security/traitor/default.nix index c809a5cbd14d..bbe9553819fb 100644 --- a/pkgs/tools/security/traitor/default.nix +++ b/pkgs/tools/security/traitor/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildGoModule , fetchFromGitHub }: diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index e3c9d77735cd..0cf2f8e633bc 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip, makeWrapper, gawk, glibc, fetchzip }: +{ lib, stdenv, fetchzip }: stdenv.mkDerivation rec { pname = "vault-bin"; diff --git a/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix index 19dd26b0b3fa..9417e1af408f 100644 --- a/pkgs/tools/security/vaultwarden/default.nix +++ b/pkgs/tools/security/vaultwarden/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, rustPlatform, fetchFromGitHub, fetchurl, nixosTests +{ lib, stdenv, callPackage, rustPlatform, fetchFromGitHub, nixosTests , pkg-config, openssl , libiconv, Security, CoreServices , dbBackend ? "sqlite", libmysqlclient, postgresql }: diff --git a/pkgs/tools/security/web-eid-app/default.nix b/pkgs/tools/security/web-eid-app/default.nix index 88fca9133b36..f392fb0147bd 100644 --- a/pkgs/tools/security/web-eid-app/default.nix +++ b/pkgs/tools/security/web-eid-app/default.nix @@ -5,7 +5,6 @@ , gtest , pcsclite , pkg-config -, qmake , qttranslations }: |