From 42a0ba411dbca26c636887e58e6359184f31f47f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Mar 2023 16:24:16 +0100 Subject: [PATCH 1/2] aiodnsbrute: add changelog to meta --- pkgs/tools/security/aiodnsbrute/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/aiodnsbrute/default.nix b/pkgs/tools/security/aiodnsbrute/default.nix index f1d170e7d599..83fe6a00ed25 100644 --- a/pkgs/tools/security/aiodnsbrute/default.nix +++ b/pkgs/tools/security/aiodnsbrute/default.nix @@ -14,8 +14,8 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "blark"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-cEpk71VoQJZfKeAZummkk7yjtXKSMndgo0VleYiMlWE="; + rev = "refs/tags/v${version}"; + hash = "sha256-cEpk71VoQJZfKeAZummkk7yjtXKSMndgo0VleYiMlWE="; }; # https://github.com/blark/aiodnsbrute/pull/8 @@ -33,12 +33,14 @@ buildPythonApplication rec { # no tests present doCheck = false; - pythonImportsCheck = [ "aiodnsbrute.cli" ]; + pythonImportsCheck = [ + "aiodnsbrute.cli" + ]; meta = with lib; { description = "DNS brute force utility"; homepage = "https://github.com/blark/aiodnsbrute"; - # https://github.com/blark/aiodnsbrute/issues/5 + changelog = "https://github.com/blark/aiodnsbrute/releases/tag/v${version}"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; }; From 8fc7ae71cef66ec6d24778c6cda34317fbfcb6e1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Mar 2023 16:29:32 +0100 Subject: [PATCH 2/2] aiodnsbrute: use python3.pkgs - remove postPatch section --- pkgs/tools/security/aiodnsbrute/default.nix | 26 +++++++-------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/security/aiodnsbrute/default.nix b/pkgs/tools/security/aiodnsbrute/default.nix index 83fe6a00ed25..c11255e6ab80 100644 --- a/pkgs/tools/security/aiodnsbrute/default.nix +++ b/pkgs/tools/security/aiodnsbrute/default.nix @@ -1,15 +1,12 @@ { lib -, buildPythonApplication , fetchFromGitHub -, aiodns -, click -, tqdm -, uvloop +, python3 }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "aiodnsbrute"; version = "0.3.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "blark"; @@ -18,19 +15,14 @@ buildPythonApplication rec { hash = "sha256-cEpk71VoQJZfKeAZummkk7yjtXKSMndgo0VleYiMlWE="; }; - # https://github.com/blark/aiodnsbrute/pull/8 - prePatch = '' - substituteInPlace setup.py --replace " 'asyncio', " "" - ''; - - propagatedBuildInputs = [ - aiodns - click - tqdm - uvloop + propagatedBuildInputs = with python3.pkgs; [ + aiodns + click + tqdm + uvloop ]; - # no tests present + # Project no tests doCheck = false; pythonImportsCheck = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8086a44fe793..6924b66a6cca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1362,7 +1362,7 @@ with pkgs; aioblescan = with python3Packages; toPythonApplication aioblescan; - aiodnsbrute = python3Packages.callPackage ../tools/security/aiodnsbrute { }; + aiodnsbrute = callPackage ../tools/security/aiodnsbrute { }; aircrack-ng = callPackage ../tools/networking/aircrack-ng { };