From c7dfc2e0cf87d81a9226b84083006767df8fc84e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 19:23:22 +0000 Subject: [PATCH 1/3] knowsmore: 0.1.37 -> 0.1.38 --- pkgs/tools/security/knowsmore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/knowsmore/default.nix b/pkgs/tools/security/knowsmore/default.nix index f73ae1032efa..f63082f3d278 100644 --- a/pkgs/tools/security/knowsmore/default.nix +++ b/pkgs/tools/security/knowsmore/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "knowsmore"; - version = "0.1.37"; + version = "0.1.38"; format = "setuptools"; src = fetchFromGitHub { owner = "helviojunior"; repo = "knowsmore"; rev = "refs/tags/v${version}"; - hash = "sha256-UxBoWK3L4u9xSQaGGHpzvs/mRlmhF3EqiS/4BYyTKos="; + hash = "sha256-A68JuzlWvq3OAtgq6uAFcTTYKmL7xjKWZ0HQfVXKt4k="; }; propagatedBuildInputs = with python3.pkgs; [ From 993f9d111d7f0b3a02b78a6a4c0d2e81e6610e38 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 May 2024 22:29:51 +0200 Subject: [PATCH 2/3] knowsmore: refactor --- pkgs/tools/security/knowsmore/default.nix | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/knowsmore/default.nix b/pkgs/tools/security/knowsmore/default.nix index f63082f3d278..e0309b9befe2 100644 --- a/pkgs/tools/security/knowsmore/default.nix +++ b/pkgs/tools/security/knowsmore/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "knowsmore"; version = "0.1.38"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "helviojunior"; @@ -15,7 +15,24 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-A68JuzlWvq3OAtgq6uAFcTTYKmL7xjKWZ0HQfVXKt4k="; }; - propagatedBuildInputs = with python3.pkgs; [ + pythonRelaxDeps = [ + "neo4j" + "urllib3" + ]; + + pythonRemoveDeps = [ + "bs4" + ]; + + build-system = with python3.pkgs; [ + setuptools + ]; + + nativeBuildInputs = with python3.pkgs; [ + pythonRelaxDepsHook + ]; + + dependencies = with python3.pkgs; [ aioconsole ansi2image beautifulsoup4 @@ -47,10 +64,10 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Tool for pentesting Microsoft Active Directory"; - mainProgram = "knowsmore"; homepage = "https://github.com/helviojunior/knowsmore"; changelog = "https://github.com/helviojunior/knowsmore/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; + mainProgram = "knowsmore"; }; } From fbe5ef5f5012e230203cd16babdec125f54d687f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 May 2024 22:30:18 +0200 Subject: [PATCH 3/3] knowsmore: format with nixfmt --- pkgs/tools/security/knowsmore/default.nix | 31 ++++++++--------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/security/knowsmore/default.nix b/pkgs/tools/security/knowsmore/default.nix index e0309b9befe2..4c460eabcbe5 100644 --- a/pkgs/tools/security/knowsmore/default.nix +++ b/pkgs/tools/security/knowsmore/default.nix @@ -1,6 +1,7 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { @@ -20,17 +21,11 @@ python3.pkgs.buildPythonApplication rec { "urllib3" ]; - pythonRemoveDeps = [ - "bs4" - ]; + pythonRemoveDeps = [ "bs4" ]; - build-system = with python3.pkgs; [ - setuptools - ]; + build-system = with python3.pkgs; [ setuptools ]; - nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ aioconsole @@ -50,17 +45,11 @@ python3.pkgs.buildPythonApplication rec { xmltodict ]; - nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook - ]; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; - pythonImportsCheck = [ - "knowsmore" - ]; + pythonImportsCheck = [ "knowsmore" ]; - pytestFlagsArray = [ - "tests/tests*" - ]; + pytestFlagsArray = [ "tests/tests*" ]; meta = with lib; { description = "Tool for pentesting Microsoft Active Directory";