From 07b9eee14bd772a3506ed9483cb2be40daddd18d Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Fri, 18 Aug 2023 22:40:09 -0700 Subject: [PATCH 1/2] python3.pkgs.pytenable: audit and propagate dependencies --- pkgs/development/python-modules/pytenable/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index 3a1fb4db881e..847fcd435525 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -1,5 +1,4 @@ { lib -, appdirs , buildPythonPackage , defusedxml , fetchFromGitHub @@ -33,26 +32,22 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - semver - ]; - - buildInputs = [ - appdirs defusedxml marshmallow python-box python-dateutil requests - requests-pkcs12 restfly + semver typing-extensions ]; nativeCheckInputs = [ - responses pytest-datafiles pytest-vcr pytestCheckHook + requests-pkcs12 + responses ]; disabledTests = [ From 684d700c12d7245ee810262a5338b95dd8a46b61 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Fri, 18 Aug 2023 22:41:34 -0700 Subject: [PATCH 2/2] faraday-agent-dispatcher: 2.4.0 -> 2.6.2 --- .../security/faraday-agent-dispatcher/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/faraday-agent-dispatcher/default.nix b/pkgs/tools/security/faraday-agent-dispatcher/default.nix index dc05255bc7ed..39f9398260f1 100644 --- a/pkgs/tools/security/faraday-agent-dispatcher/default.nix +++ b/pkgs/tools/security/faraday-agent-dispatcher/default.nix @@ -5,16 +5,21 @@ python3.pkgs.buildPythonApplication rec { pname = "faraday-agent-dispatcher"; - version = "2.4.0"; + version = "2.6.2"; format = "setuptools"; src = fetchFromGitHub { owner = "infobyte"; repo = "faraday_agent_dispatcher"; rev = "refs/tags/${version}"; - hash = "sha256-gZXA+2zW25Dl8JmBgg7APZt6ZdpFOEFZXAkiZ+tn/4g="; + hash = "sha256-+lsejepg/iBHo6CRAGNHjiUC7ZgboHbKu7EDmlN3lVk="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace '"pytest-runner",' "" + ''; + nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; @@ -26,6 +31,7 @@ python3.pkgs.buildPythonApplication rec { faraday-plugins itsdangerous psutil + pytenable python-gvm python-owasp-zap-v2-4 pyyaml @@ -39,11 +45,6 @@ python3.pkgs.buildPythonApplication rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py \ - --replace '"pytest-runner",' "" - ''; - preCheck = '' export HOME=$(mktemp -d); '';