From cb298f45176778c7c2d9ca9ad5ba903ea4788411 Mon Sep 17 00:00:00 2001 From: mana-byte Date: Sun, 8 Mar 2026 19:36:47 +0100 Subject: [PATCH 1/7] python3Packages.requests-ratelimiter: unbreak --- .../development/python-modules/requests-ratelimiter/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/requests-ratelimiter/default.nix b/pkgs/development/python-modules/requests-ratelimiter/default.nix index 51936c926f3e..6b278ba6c82b 100644 --- a/pkgs/development/python-modules/requests-ratelimiter/default.nix +++ b/pkgs/development/python-modules/requests-ratelimiter/default.nix @@ -38,8 +38,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "requests_ratelimiter" ]; meta = { - # https://github.com/JWCook/requests-ratelimiter/issues/78 - broken = lib.versionOlder pyrate-limiter.version "4"; description = "Module for rate-limiting for requests"; homepage = "https://github.com/JWCook/requests-ratelimiter"; changelog = "https://github.com/JWCook/requests-ratelimiter/blob/${finalAttrs.src.tag}/HISTORY.md"; From e628961b5fca9d71fe1d300e099133d35c091d27 Mon Sep 17 00:00:00 2001 From: mana-byte Date: Sun, 8 Mar 2026 20:31:18 +0100 Subject: [PATCH 2/7] python3Packages.clize: disable failing tests --- .../python-modules/clize/default.nix | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix index 0ac03b94f2d0..6fb842dafe4e 100644 --- a/pkgs/development/python-modules/clize/default.nix +++ b/pkgs/development/python-modules/clize/default.nix @@ -6,13 +6,13 @@ fetchPypi, od, pygments, + pythonAtLeast, python-dateutil, repeated-test, setuptools-scm, sigtools, unittestCheckHook, }: - buildPythonPackage rec { pname = "clize"; version = "5.0.2"; @@ -43,6 +43,24 @@ buildPythonPackage rec { repeated-test ]; + unittestFlags = + let + disabledTests = [ + "test_help.ElementsFromAutodetectedDocstringTests.test_sphinx_has_sphinx_error_in_param_desc" + "test_help.ElementsFromAutodetectedDocstringTests.test_sphinx_has_sphinx_error_in_free_text" + "test_help.ElementsFromAutodetectedDocstringTests.test_clize_sphinx_error" + "test_help.ElementsFromAutodetectedDocstringTests.test_clize_has_sphinx_error" + ] + ++ lib.optionals (pythonAtLeast "3.14") [ + "test_help.ClizeWholeHelpTests.test_custom_param_help" + ]; + matchingPattern = builtins.concatStringsSep "|" disabledTests; + in + [ + "-s clize/tests" + "-k [!(${matchingPattern})]" + ]; + pythonImportsCheck = [ "clize" ]; meta = { From 308e6fd1a32b83be1fda65198e986e9488093568 Mon Sep 17 00:00:00 2001 From: mana-byte Date: Sun, 8 Mar 2026 20:38:01 +0100 Subject: [PATCH 3/7] conkeyscan: remove pyrate-limiter_2 override --- pkgs/by-name/co/conkeyscan/package.nix | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/co/conkeyscan/package.nix b/pkgs/by-name/co/conkeyscan/package.nix index f5ccf0110e29..9128e1f7ca0a 100644 --- a/pkgs/by-name/co/conkeyscan/package.nix +++ b/pkgs/by-name/co/conkeyscan/package.nix @@ -4,18 +4,7 @@ fetchFromGitHub, fetchpatch, }: - -let - python = python3.override { - self = python3; - packageOverrides = self: super: { - pyrate-limiter = super.pyrate-limiter_2; - }; - }; - -in - -python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "conkeyscan"; version = "1.1.0"; pyproject = true; @@ -41,9 +30,9 @@ python.pkgs.buildPythonApplication rec { --replace-fail "{{VERSION_PLACEHOLDER}}" "${version}" ''; - build-system = with python.pkgs; [ setuptools ]; + build-system = with python3.pkgs; [ setuptools ]; - dependencies = with python.pkgs; [ + dependencies = with python3.pkgs; [ atlassian-python-api beautifulsoup4 clize From 18ba36899b26c9996a863a66b4b8aad4236113ca Mon Sep 17 00:00:00 2001 From: mana-byte Date: Mon, 9 Mar 2026 12:07:11 +0100 Subject: [PATCH 4/7] sbomnix: remove pyrate-limiter_2 override --- pkgs/by-name/sb/sbomnix/package.nix | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/sb/sbomnix/package.nix b/pkgs/by-name/sb/sbomnix/package.nix index 1dd45df9a6d3..d444cd44d110 100644 --- a/pkgs/by-name/sb/sbomnix/package.nix +++ b/pkgs/by-name/sb/sbomnix/package.nix @@ -8,18 +8,7 @@ python3, vulnix, }: - -let - python = python3.override { - self = python3; - packageOverrides = self: super: { - pyrate-limiter = super.pyrate-limiter_2; - }; - }; - -in - -python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "sbomnix"; version = "1.7.4"; pyproject = true; @@ -42,7 +31,7 @@ python.pkgs.buildPythonApplication rec { lib.makeBinPath [ git nix - python.pkgs.graphviz + python3.pkgs.graphviz nix-visualize vulnix grype @@ -50,9 +39,9 @@ python.pkgs.buildPythonApplication rec { }" ]; - build-system = [ python.pkgs.setuptools ]; + build-system = [ python3.pkgs.setuptools ]; - dependencies = with python.pkgs; [ + dependencies = with python3.pkgs; [ beautifulsoup4 colorlog dfdiskcache From 2c225d7e3e91d483adfe89e8381514df8f27a5ac Mon Sep 17 00:00:00 2001 From: mana-byte Date: Mon, 9 Mar 2026 20:29:17 +0100 Subject: [PATCH 5/7] conkeyscan: use finalAttrs pattern --- pkgs/by-name/co/conkeyscan/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/co/conkeyscan/package.nix b/pkgs/by-name/co/conkeyscan/package.nix index 9128e1f7ca0a..75fcf783d722 100644 --- a/pkgs/by-name/co/conkeyscan/package.nix +++ b/pkgs/by-name/co/conkeyscan/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fetchpatch, }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication (finalAttrs: { pname = "conkeyscan"; version = "1.1.0"; pyproject = true; @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "CompassSecurity"; repo = "conkeyscan"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-xYCms+Su7FmaG7KVHZpzfD/wx9Gepz11t8dEK/YDfvI="; }; @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ - --replace-fail "{{VERSION_PLACEHOLDER}}" "${version}" + --replace-fail "{{VERSION_PLACEHOLDER}}" "${finalAttrs.version}" ''; build-system = with python3.pkgs; [ setuptools ]; @@ -51,9 +51,9 @@ python3.pkgs.buildPythonApplication rec { meta = { description = "Tool to scan Confluence for keywords"; homepage = "https://github.com/CompassSecurity/conkeyscan"; - changelog = "https://github.com/CompassSecurity/conkeyscan/releases/tag/v${version}"; + changelog = "https://github.com/CompassSecurity/conkeyscan/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "conkeyscan"; }; -} +}) From 5f7c17da30ceac97304e833df2171c4d5129b17c Mon Sep 17 00:00:00 2001 From: mana-byte Date: Mon, 9 Mar 2026 20:29:41 +0100 Subject: [PATCH 6/7] sbomnix: use finalAttrs pattern --- pkgs/by-name/sb/sbomnix/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sb/sbomnix/package.nix b/pkgs/by-name/sb/sbomnix/package.nix index d444cd44d110..74b432f452cf 100644 --- a/pkgs/by-name/sb/sbomnix/package.nix +++ b/pkgs/by-name/sb/sbomnix/package.nix @@ -8,7 +8,7 @@ python3, vulnix, }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication (finalAttrs: { pname = "sbomnix"; version = "1.7.4"; pyproject = true; @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "tiiuae"; repo = "sbomnix"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-s7mmtbELRcl/7ab5A3fU7f8m4rIm+mBLmXMeYHa7/n4="; # Remove documentation as it contains references to nix store @@ -78,4 +78,4 @@ python3.pkgs.buildPythonApplication rec { ]; mainProgram = "sbomnix"; }; -} +}) From 84c66f5421cb9edd33a4a5c06052c9d9e4361828 Mon Sep 17 00:00:00 2001 From: mana-byte Date: Mon, 9 Mar 2026 20:29:56 +0100 Subject: [PATCH 7/7] python3Packages.clize: use finalAttrs pattern --- pkgs/development/python-modules/clize/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix index 6fb842dafe4e..fd8d7d6cb36c 100644 --- a/pkgs/development/python-modules/clize/default.nix +++ b/pkgs/development/python-modules/clize/default.nix @@ -13,13 +13,13 @@ sigtools, unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "clize"; version = "5.0.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-BH9aRHNgJxirG4VnKn4VMDOHF41agcJ13EKd+sHstRA="; }; @@ -66,8 +66,8 @@ buildPythonPackage rec { meta = { description = "Command-line argument parsing for Python"; homepage = "https://github.com/epsy/clize"; - changelog = "https://github.com/epsy/clize/releases/tag/v${version}"; + changelog = "https://github.com/epsy/clize/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = [ ]; }; -} +})