From e936cee0b58bb979059218433eebeb8faed321da Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Dec 2021 23:09:13 +0100 Subject: [PATCH] wafw00f: migrate to new Python app style --- pkgs/tools/security/wafw00f/default.nix | 14 ++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/wafw00f/default.nix b/pkgs/tools/security/wafw00f/default.nix index dae4f5a5ad0c..0e363b608fd4 100644 --- a/pkgs/tools/security/wafw00f/default.nix +++ b/pkgs/tools/security/wafw00f/default.nix @@ -1,13 +1,12 @@ { lib -, buildPythonApplication , fetchFromGitHub -, pluginbase -, requests +, python3 }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "wafw00f"; version = "2.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "EnableSecurity"; @@ -16,14 +15,17 @@ buildPythonApplication rec { sha256 = "0526kz6ypww9nxc2vddkhpn1gqvn25mzj3wmi91wwxwxjjb6w4qj"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ requests pluginbase ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "wafw00f" ]; + + pythonImportsCheck = [ + "wafw00f" + ]; meta = with lib; { description = "Tool to identify and fingerprint Web Application Firewalls (WAF)"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a698cf8fb640..430e7e74fb71 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29149,7 +29149,7 @@ with pkgs; wad = python3Packages.callPackage ../tools/security/wad { }; - wafw00f = python3Packages.callPackage ../tools/security/wafw00f { }; + wafw00f = callPackage ../tools/security/wafw00f { }; waon = callPackage ../applications/audio/waon { };