From 07729dfccff5e092c5e18821a5e077d5fd573863 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Jul 2022 13:16:53 +0200
Subject: [PATCH] wapiti: remove condition for importlib-metadata

---
 pkgs/tools/security/wapiti/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/security/wapiti/default.nix b/pkgs/tools/security/wapiti/default.nix
index c86cd9b8f87..72e7f6f70a0 100644
--- a/pkgs/tools/security/wapiti/default.nix
+++ b/pkgs/tools/security/wapiti/default.nix
@@ -15,10 +15,6 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "sha256-nGAG+7FqEktc55i5Q2urKh52vm/i6kX4kvS2AVUAUjA=";
   };
 
-  nativeBuildInputs = with python3.pkgs; [
-    pytest-runner
-  ];
-
   propagatedBuildInputs = with python3.pkgs; [
     aiocache
     aiosqlite
@@ -30,6 +26,7 @@ python3.pkgs.buildPythonApplication rec {
     httpcore
     httpx
     humanize
+    importlib-metadata
     loguru
     Mako
     markupsafe
@@ -37,10 +34,8 @@ python3.pkgs.buildPythonApplication rec {
     sqlalchemy
     tld
     yaswfp
-  ] ++ lib.optionals (python3.pythonOlder "3.8") [
-    importlib-metadata
   ] ++ httpx.optional-dependencies.brotli
-    ++ httpx.optional-dependencies.socks;
+  ++ httpx.optional-dependencies.socks;
 
   checkInputs = with python3.pkgs; [
     respx
@@ -51,6 +46,8 @@ python3.pkgs.buildPythonApplication rec {
   postPatch = ''
     # Ignore pinned versions
     sed -i -e "s/==[0-9.]*//;s/>=[0-9.]*//" setup.py
+    substituteInPlace setup.py \
+      --replace '"pytest-runner"' ""
     substituteInPlace setup.cfg \
       --replace " --cov --cov-report=xml" ""
   '';
@@ -119,8 +116,9 @@ python3.pkgs.buildPythonApplication rec {
     # TypeError: Expected bytes or bytes-like object got: <class 'str'>
     "test_persister_upload"
   ];
+
   disabledTestPaths = [
-    # requires sslyze
+    # Requires sslyze which is obsolete and was removed
     "tests/attack/test_mod_ssl.py"
   ];