From c22e54f4968d753fc4e6101dfa9e19d09d3285f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Oct 2024 12:11:51 +0000
Subject: [PATCH 1/2] apachetomcatscanner: 3.5 -> 3.7.2

---
 pkgs/tools/security/apachetomcatscanner/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/apachetomcatscanner/default.nix b/pkgs/tools/security/apachetomcatscanner/default.nix
index 224924721620..26bc765e5ea8 100644
--- a/pkgs/tools/security/apachetomcatscanner/default.nix
+++ b/pkgs/tools/security/apachetomcatscanner/default.nix
@@ -5,14 +5,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "apachetomcatscanner";
-  version = "3.5";
+  version = "3.7.2";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "p0dalirius";
     repo = "ApacheTomcatScanner";
     rev = "refs/tags/${version}";
-    hash = "sha256-ChVVXUjm6y71iRs64Kv63oiOG1GSqmx6J0YiGtEI0ao=";
+    hash = "sha256-mzpJq0er13wcekTac3j4cnRokHh6Q0seM8vwZsM2tN8=";
   };
 
   # Posted a PR for discussion upstream that can be followed:

From bc840cbeb44be8297207064f73ca12c1b934bf7f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 6 Oct 2024 09:59:20 +0200
Subject: [PATCH 2/2] apachetomcatscanner: refactor

---
 pkgs/tools/security/apachetomcatscanner/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/apachetomcatscanner/default.nix b/pkgs/tools/security/apachetomcatscanner/default.nix
index 26bc765e5ea8..ea0cdd2db5ab 100644
--- a/pkgs/tools/security/apachetomcatscanner/default.nix
+++ b/pkgs/tools/security/apachetomcatscanner/default.nix
@@ -6,7 +6,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "apachetomcatscanner";
   version = "3.7.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "p0dalirius";
@@ -21,6 +21,8 @@ python3.pkgs.buildPythonApplication rec {
     sed -i '/apachetomcatscanner=apachetomcatscanner\.__main__:main/d' setup.py
   '';
 
+  build-system = with python3.pkgs; [ setuptools ];
+
   propagatedBuildInputs = with python3.pkgs; [
     requests
     sectools
@@ -39,7 +41,7 @@ python3.pkgs.buildPythonApplication rec {
     mainProgram = "ApacheTomcatScanner";
     homepage = "https://github.com/p0dalirius/ApacheTomcatScanner";
     changelog = "https://github.com/p0dalirius/ApacheTomcatScanner/releases/tag/${version}";
-    license = with licenses; [ gpl2Only ];
+    license = licenses.gpl2Only;
     maintainers = with maintainers; [ fab ];
   };
 }