From e9f73b70e46425f5eb64faba8b9bae522c75a79e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 17 Dec 2021 09:05:09 +0100
Subject: [PATCH] log4shell-detector: unstable-2021-12-15 ->
 unstable-2021-12-16

---
 .../security/log4shell-detector/default.nix     | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/security/log4shell-detector/default.nix b/pkgs/tools/security/log4shell-detector/default.nix
index bf46793fe824..6c51c5bcd6e9 100644
--- a/pkgs/tools/security/log4shell-detector/default.nix
+++ b/pkgs/tools/security/log4shell-detector/default.nix
@@ -5,16 +5,20 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "log4shell-detector";
-  version = "unstable-2021-12-15";
-  format = "other";
+  version = "unstable-2021-12-16";
+  format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "Neo23x0";
     repo = pname;
-    rev = "66d974af40049c0cab7b0d7f988e5d705031f3af";
-    sha256 = "sha256-wKNJWbnDPY3+k7RwEjJws1h4nIqL22Dr2m88CbJZ/rg=";
+    rev = "622b88e7ea36819da23ce6ac090785cd6cca77f9";
+    sha256 = "sha256-N81x9hq473LfM+bQIQLWizCAsVc/pzyB84PV7/N5jk4=";
   };
 
+  propagatedBuildInputs = with python3.pkgs; [
+    zstandard
+  ];
+
   checkInputs = with python3.pkgs; [
     pytestCheckHook
   ];
@@ -22,14 +26,15 @@ python3.pkgs.buildPythonApplication rec {
   installPhase = ''
     runHook preInstall
     install -vD ${pname}.py $out/bin/${pname}
+    install -vd $out/${python3.sitePackages}/
+    cp -R Log4ShellDetector $out/${python3.sitePackages}
     runHook postInstall
   '';
 
   meta = with lib; {
     description = "Detector for Log4Shell exploitation attempts";
     homepage = "https://github.com/Neo23x0/log4shell-detector";
-    # https://github.com/Neo23x0/log4shell-detector/issues/24
-    license = licenses.unfree;
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
 }