Merge master into staging-next

2 files changed, 3 insertions, 54 deletions

diff --git a/pkgs/tools/security/das/default.nix b/pkgs/tools/security/das/default.nix
deleted file mode 100644
index 2f7cd2fa98f7b..0000000000000
--- a/pkgs/tools/security/das/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ lib
-, python3
-, fetchFromGitHub
-}:
-
-python3.pkgs.buildPythonApplication rec {
-  pname = "das";
-  version = "0.3.8";
-  format = "pyproject";
-
-  src = fetchFromGitHub {
-    owner = "snovvcrash";
-    repo = "DivideAndScan";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-a9gnEBTvZshw42M/GrpCgjZh6FOzL45aZqGRyeHO0ec=";
-  };
-
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'networkx = "^2.8.4"' 'networkx = "*"' \
-      --replace 'pandas = "^1.4.2"' 'pandas = "*"'
-  '';
-
-  nativeBuildInputs = with python3.pkgs; [
-    poetry-core
-  ];
-
-  propagatedBuildInputs = with python3.pkgs; [
-    dash
-    defusedxml
-    dnspython
-    netaddr
-    networkx
-    pandas
-    plotly
-    python-nmap
-    scipy
-    tinydb
-  ];
-
-  pythonImportsCheck = [
-    "das"
-  ];
-
-  meta = with lib; {
-    description = "Divide full port scan results and use it for targeted Nmap runs";
-    homepage = "https://github.com/snovvcrash/DivideAndScan";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ fab ];
-  };
-}
diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix
index c986dbab98cf8..aa4c8f9a3d3ed 100644
--- a/pkgs/tools/security/trufflehog/default.nix
+++ b/pkgs/tools/security/trufflehog/default.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "trufflehog";
-  version = "3.67.6";
+  version = "3.67.7";
 
   src = fetchFromGitHub {
     owner = "trufflesecurity";
     repo = "trufflehog";
     rev = "refs/tags/v${version}";
-    hash = "sha256-LKnFlgMbgp47mNkER+gE4PwEpqBY1txmhDpmcPCXH24=";
+    hash = "sha256-EgAZVFWhAmC24kDYIsvyHcjT7DbmQ3PRO9dSAT3ZdXU=";
   };
 
-  vendorHash = "sha256-/DKly5ZFrySYrjGywjsyQd5Ky1bQ+ZIJll0io6XC5+s=";
+  vendorHash = "sha256-KkP8NY35Uo0RM14VSGqAJ3yhw8dXDi5JDPpkBYPmpfQ=";
 
   ldflags = [
     "-s"