From 2f9ba4329f3e54a371c8dadc11080a1a986fc771 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 19 Mar 2026 17:22:12 -0700 Subject: [PATCH 1/8] python3Packages.pytenable: organize imports --- .../python-modules/pytenable/default.nix | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index 9a9e0204176e..6fdeb32ec110 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -1,28 +1,34 @@ { lib, buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies cryptography, defusedxml, - fetchFromGitHub, gql, graphql-core, marshmallow, - pydantic-extra-types, pydantic, + pydantic-extra-types, + python-box, + python-dateutil, + requests, + requests-toolbelt, + restfly, + semver, + typing-extensions, + + # tests pytest-cov-stub, pytest-datafiles, pytest-vcr, pytestCheckHook, - python-box, - python-dateutil, requests-pkcs12, - requests-toolbelt, - requests, responses, - restfly, - semver, - setuptools, - typing-extensions, }: buildPythonPackage rec { From ae40d907aacd73ff4d54e331fb2c48ad78108551 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 12 Mar 2026 14:51:38 -0700 Subject: [PATCH 2/8] python3Packages.pytenable: migrate to finalAttrs --- pkgs/development/python-modules/pytenable/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index 6fdeb32ec110..7c58cd5ed927 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -31,7 +31,7 @@ responses, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytenable"; version = "1.9.0"; pyproject = true; @@ -39,7 +39,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tenable"; repo = "pyTenable"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ml5364D3qvd6VNhF2JyGoCzxbdO0DBkaBMoD38O5x8o="; }; @@ -104,8 +104,9 @@ buildPythonPackage rec { meta = { description = "Python library for the Tenable.io and TenableSC API"; homepage = "https://github.com/tenable/pyTenable"; - changelog = "https://github.com/tenable/pyTenable/releases/tag/${src.tag}"; + changelog = "https://github.com/tenable/pyTenable/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) + From 7af57981ad7c407873c2f4ed9f9059507b8a8981 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 12 Mar 2026 14:57:02 -0700 Subject: [PATCH 3/8] python3Packages.pytenable: pin marshmallow<4 --- .../python-modules/pytenable/default.nix | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index 7c58cd5ed927..9cfe7813df0c 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -11,7 +11,6 @@ defusedxml, gql, graphql-core, - marshmallow, pydantic, pydantic-extra-types, python-box, @@ -22,6 +21,9 @@ semver, typing-extensions, + # marshmallow build system + flit-core, + # tests pytest-cov-stub, pytest-datafiles, @@ -30,7 +32,26 @@ requests-pkcs12, responses, }: +let + marshmallow' = buildPythonPackage { + pname = "marshmallow"; + version = "3.26.2"; + pyproject = true; + src = fetchFromGitHub { + owner = "marshmallow-code"; + repo = "marshmallow"; + tag = "3.26.2"; + hash = "sha256-ioe+aZHOW8r3wF3UknbTjAP0dEggd/NL9PTkPVQ46zM="; + }; + + build-system = [ flit-core ]; + + doCheck = false; + + pythonImportsCheck = [ "marshmallow" ]; + }; +in buildPythonPackage (finalAttrs: { pname = "pytenable"; version = "1.9.0"; @@ -55,7 +76,7 @@ buildPythonPackage (finalAttrs: { defusedxml gql graphql-core - marshmallow + marshmallow' pydantic pydantic-extra-types python-box @@ -109,4 +130,3 @@ buildPythonPackage (finalAttrs: { maintainers = with lib.maintainers; [ fab ]; }; }) - From daaf7c78f5302d94f7db4739cc78201fbe6c4693 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 12 Mar 2026 14:59:16 -0700 Subject: [PATCH 4/8] python3Packages.pytenable: disable pytest warning that breaks build --- pkgs/development/python-modules/pytenable/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index 9cfe7813df0c..a550bbc079aa 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -97,6 +97,10 @@ buildPythonPackage (finalAttrs: { responses ]; + pytestFlags = [ + "-Wignore::pytest.PytestRemovedIn9Warning" + ]; + disabledTestPaths = [ # Disable tests that requires network access "tests/io/" From bebedd13b1ab73c2303d1201444456a1b77b7ebc Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 12 Mar 2026 15:23:21 -0700 Subject: [PATCH 5/8] python3Packages.faraday-agent-parameters-types: build from github source --- .../faraday-agent-parameters-types/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix index 076a1e61d727..d0ab4acd3b01 100644 --- a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix +++ b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, marshmallow, packaging, pytestCheckHook, @@ -14,10 +14,11 @@ buildPythonPackage rec { version = "1.9.1"; pyproject = true; - src = fetchPypi { - pname = "faraday_agent_parameters_types"; - inherit version; - hash = "sha256-PWO4wufHGIgAi1BHoM/+6ZjsUDB4oY26NsHOdNYYTJc="; + src = fetchFromGitHub { + owner = "infobyte"; + repo = "faraday_agent_parameters_types"; + tag = version; + hash = "sha256-Oe/9/zKOoCLK3JHMacOhk2+d91MrhzkBTW3POoFm71M="; }; pythonRelaxDeps = [ "validators" ]; From 478cb0c0e690960354ed162f941a4583b59fb928 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 12 Mar 2026 15:25:14 -0700 Subject: [PATCH 6/8] python3Packages.faraday-agent-parameters-types: migrate to finalAttrs --- .../faraday-agent-parameters-types/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix index d0ab4acd3b01..edd31372b3ec 100644 --- a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix +++ b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix @@ -9,7 +9,7 @@ validators, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "faraday-agent-parameters-types"; version = "1.9.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "infobyte"; repo = "faraday_agent_parameters_types"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Oe/9/zKOoCLK3JHMacOhk2+d91MrhzkBTW3POoFm71M="; }; @@ -51,8 +51,8 @@ buildPythonPackage rec { meta = { description = "Collection of Faraday agent parameters types"; homepage = "https://github.com/infobyte/faraday_agent_parameters_types"; - changelog = "https://github.com/infobyte/faraday_agent_parameters_types/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/infobyte/faraday_agent_parameters_types/blob/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ fab ]; }; -} +}) From 152025cb3f15c85cbe58f65686670b87a88c8341 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 12 Mar 2026 15:18:58 -0700 Subject: [PATCH 7/8] python3Packages.faraday-agent-parameters-types: override marshmallow to < 4 --- .../default.nix | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix index edd31372b3ec..acfc96d9db60 100644 --- a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix +++ b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix @@ -2,13 +2,32 @@ lib, buildPythonPackage, fetchFromGitHub, - marshmallow, + flit-core, packaging, pytestCheckHook, setuptools, validators, }: +let + marshmallow' = buildPythonPackage { + pname = "marshmallow"; + version = "3.26.2"; + pyproject = true; + src = fetchFromGitHub { + owner = "marshmallow-code"; + repo = "marshmallow"; + tag = "3.26.2"; + hash = "sha256-ioe+aZHOW8r3wF3UknbTjAP0dEggd/NL9PTkPVQ46zM="; + }; + + build-system = [ flit-core ]; + + doCheck = false; + + pythonImportsCheck = [ "marshmallow" ]; + }; +in buildPythonPackage (finalAttrs: { pname = "faraday-agent-parameters-types"; version = "1.9.1"; @@ -31,7 +50,7 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; dependencies = [ - marshmallow + marshmallow' packaging validators ]; From a6808eb627c68209b5977e9945b5f53d1e47f02f Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 12 Mar 2026 15:55:35 -0700 Subject: [PATCH 8/8] faraday-agent-dispatcher: 3.4.2 -> 3.9.1 --- .../fa/faraday-agent-dispatcher/package.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fa/faraday-agent-dispatcher/package.nix b/pkgs/by-name/fa/faraday-agent-dispatcher/package.nix index 08d8bf24d643..b371db2fd199 100644 --- a/pkgs/by-name/fa/faraday-agent-dispatcher/package.nix +++ b/pkgs/by-name/fa/faraday-agent-dispatcher/package.nix @@ -6,29 +6,36 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "faraday-agent-dispatcher"; - version = "3.4.2"; + version = "3.9.1"; pyproject = true; src = fetchFromGitHub { owner = "infobyte"; repo = "faraday_agent_dispatcher"; tag = finalAttrs.version; - hash = "sha256-Qr3ZGU4y7f6yHD78ecdv7a6IBFDpT+/4Yez0n/MenN0="; + hash = "sha256-uf1oXE8pFvIPTDgcHXRbZDz8NZn9NecPe1eYuYhb1Xw="; }; postPatch = '' substituteInPlace setup.py \ - --replace-fail '"pytest-runner",' "" - ''; + --replace-fail '"pytest-runner",' "" ''; pythonRelaxDeps = [ "python-socketio" ]; + pythonRemoveDeps = [ + "python-owasp-zap-v2.4" + ]; + build-system = with python3.pkgs; [ setuptools-scm ]; + nativeBuildInputs = [ + python3.pkgs.python-owasp-zap-v2-4 + ]; + dependencies = with python3.pkgs; [ aiohttp click @@ -42,6 +49,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { python-socketio pyyaml requests + requests-ratelimiter syslog-rfc5424-formatter websockets ];