From fd7d75f2893f48262389fc67a3b409eee8e7f9dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Oct 2025 09:24:34 -0700 Subject: [PATCH 01/10] python3Packages.legacy-cgi: 2.6.3 -> 2.6.4 Diff: https://github.com/jackrosenthal/legacy-cgi/compare/v2.6.3...v2.6.4 Changelog: https://github.com/jackrosenthal/legacy-cgi/releases/tag/v2.6.4 --- pkgs/development/python-modules/legacy-cgi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/legacy-cgi/default.nix b/pkgs/development/python-modules/legacy-cgi/default.nix index ede0920e3411..b52561050407 100644 --- a/pkgs/development/python-modules/legacy-cgi/default.nix +++ b/pkgs/development/python-modules/legacy-cgi/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "legacy-cgi"; - version = "2.6.3"; + version = "2.6.4"; pyproject = true; src = fetchFromGitHub { owner = "jackrosenthal"; repo = "legacy-cgi"; tag = "v${version}"; - hash = "sha256-l2BuSlxAA31VlJ/Fhs4cGbidbXEt/zEH3BiWsuh29GM="; + hash = "sha256-2CCYRRWP8FP54AcLnehJ0Kj3F3U4cz8vnesSj5EakdA="; }; build-system = [ hatchling ]; From 396ec023210e289f16cb696aaf903d7b7452fb11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Oct 2025 09:30:51 -0700 Subject: [PATCH 02/10] python3Packages.legacy-cgi: set to null on Python < 3.13 The cgi module is part of the standard library up to Python 3.12. --- pkgs/top-level/python-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a65855a2a2aa..3352b2841d10 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8143,7 +8143,8 @@ self: super: with self; { legacy-api-wrap = callPackage ../development/python-modules/legacy-api-wrap { }; - legacy-cgi = callPackage ../development/python-modules/legacy-cgi { }; + legacy-cgi = + if pythonOlder "3.13" then null else callPackage ../development/python-modules/legacy-cgi { }; leidenalg = callPackage ../development/python-modules/leidenalg { igraph-c = pkgs.igraph; }; From 814ebb5d7127c03d58880ff86e3216b946700004 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Oct 2025 09:34:08 -0700 Subject: [PATCH 03/10] python3Packages.servefile: don't make legacy-cgi optional It's null anyway on Python 3.12 and below. --- pkgs/development/python-modules/servefile/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/servefile/default.nix b/pkgs/development/python-modules/servefile/default.nix index 1d1c0c175bac..67cd43a9094e 100644 --- a/pkgs/development/python-modules/servefile/default.nix +++ b/pkgs/development/python-modules/servefile/default.nix @@ -5,7 +5,6 @@ lib, pyopenssl, pytestCheckHook, - pythonAtLeast, requests, }: @@ -22,9 +21,9 @@ buildPythonPackage rec { }; dependencies = [ + legacy-cgi pyopenssl - ] - ++ lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ]; + ]; nativeCheckInputs = [ pytestCheckHook From 1e3b06793c04925af27cdf34d4b1e8fced178b33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Oct 2025 09:34:22 -0700 Subject: [PATCH 04/10] python3Packages.filedepot: don't make legacy-cgi optional It's null anyway on Python 3.12 and below. --- pkgs/development/python-modules/filedepot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/filedepot/default.nix b/pkgs/development/python-modules/filedepot/default.nix index 072e6ea60ef1..f620aac9a360 100644 --- a/pkgs/development/python-modules/filedepot/default.nix +++ b/pkgs/development/python-modules/filedepot/default.nix @@ -35,9 +35,9 @@ buildPythonPackage rec { dependencies = [ anyascii + legacy-cgi google-cloud-storage - ] - ++ lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ]; + ]; nativeCheckInputs = [ flaky From 13704f1cf21720fbf961fabd24caeeace210772e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Oct 2025 09:35:47 -0700 Subject: [PATCH 05/10] python3Packages.pywebcopy: don't make legacy-cgi optional It's null anyway on Python 3.12 and below. --- pkgs/development/python-modules/pywebcopy/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pywebcopy/default.nix b/pkgs/development/python-modules/pywebcopy/default.nix index ebdda05aeead..028a78177ea9 100644 --- a/pkgs/development/python-modules/pywebcopy/default.nix +++ b/pkgs/development/python-modules/pywebcopy/default.nix @@ -6,7 +6,6 @@ legacy-cgi, lxml-html-clean, pytestCheckHook, - pythonAtLeast, requests, setuptools, six, @@ -28,11 +27,11 @@ buildPythonPackage rec { dependencies = [ cachecontrol + legacy-cgi lxml-html-clean requests six - ] - ++ lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ]; + ]; nativeCheckInputs = [ pytestCheckHook ]; From 8e503184565e2e0ddb9fdcfda8a8eeaf913dcf72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Oct 2025 09:36:56 -0700 Subject: [PATCH 06/10] python3Packages.webob: don't make legacy-cgi optional It's null anyway on Python 3.12 and below. --- pkgs/development/python-modules/webob/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/webob/default.nix b/pkgs/development/python-modules/webob/default.nix index 34425a936f34..d45c06105875 100644 --- a/pkgs/development/python-modules/webob/default.nix +++ b/pkgs/development/python-modules/webob/default.nix @@ -5,7 +5,6 @@ setuptools, legacy-cgi, pytestCheckHook, - pythonAtLeast, pythonOlder, # for passthru.tests @@ -31,7 +30,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; # https://github.com/Pylons/webob/issues/437 - dependencies = lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ]; + dependencies = [ legacy-cgi ]; nativeCheckInputs = [ pytestCheckHook ]; From 96f19043304b1141a8778e5685918e0a045029c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Oct 2025 09:37:34 -0700 Subject: [PATCH 07/10] python3Packages.wfuzz: don't make legacy-cgi optional It's null anyway on Python 3.12 and below. --- pkgs/development/python-modules/wfuzz/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/wfuzz/default.nix b/pkgs/development/python-modules/wfuzz/default.nix index 2277341460be..9d00d2a3a5c0 100644 --- a/pkgs/development/python-modules/wfuzz/default.nix +++ b/pkgs/development/python-modules/wfuzz/default.nix @@ -14,7 +14,6 @@ setuptools, six, fetchpatch2, - pythonAtLeast, legacy-cgi, }: @@ -51,13 +50,13 @@ buildPythonPackage rec { dependencies = [ chardet distutils # src/wfuzz/plugin_api/base.py + legacy-cgi pycurl six setuptools pyparsing ] - ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ] - ++ lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ]; + ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ]; nativeCheckInputs = [ netaddr From 3fd87331eeee862c27d98552e2495086b8df54a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Oct 2025 09:38:52 -0700 Subject: [PATCH 08/10] python3Packages.pydal: don't make legacy-cgi optional It's null anyway on Python 3.12 and below. --- pkgs/development/python-modules/pydal/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydal/default.nix b/pkgs/development/python-modules/pydal/default.nix index 04db786876f1..fe850650f330 100644 --- a/pkgs/development/python-modules/pydal/default.nix +++ b/pkgs/development/python-modules/pydal/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchPypi, pytestCheckHook, - pythonAtLeast, pythonOlder, setuptools, legacy-cgi, @@ -26,7 +25,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - checkInputs = lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ]; + checkInputs = [ legacy-cgi ]; enabledTestPaths = [ "tests/*.py" From 5907068fd5fe9a4318e923a5454cd5a2ca895ff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Oct 2025 09:39:40 -0700 Subject: [PATCH 09/10] python3Packages.web: don't make legacy-cgi optional It's null anyway on Python 3.12 and below. --- pkgs/development/python-modules/web/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/web/default.nix b/pkgs/development/python-modules/web/default.nix index b79a399aea5d..7cedc0a391c0 100644 --- a/pkgs/development/python-modules/web/default.nix +++ b/pkgs/development/python-modules/web/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonAtLeast, pytestCheckHook, cheroot, legacy-cgi, @@ -25,8 +24,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ cheroot - ] - ++ lib.optional (pythonAtLeast "3.13") legacy-cgi; + legacy-cgi + ]; # requires multiple running databases doCheck = false; From 19f7589a8b3811cecb4ef6187a777829df06b2cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Oct 2025 09:40:51 -0700 Subject: [PATCH 10/10] python3Packages.remi: don't make legacy-cgi optional It's null anyway on Python 3.12 and below. --- pkgs/development/python-modules/remi/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/remi/default.nix b/pkgs/development/python-modules/remi/default.nix index 1e55434b8f9d..0db323c1c46a 100644 --- a/pkgs/development/python-modules/remi/default.nix +++ b/pkgs/development/python-modules/remi/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, pytestCheckHook, matplotlib, @@ -47,8 +46,6 @@ buildPythonPackage rec { dependencies = [ setuptools # pkg_resources is referenced at runtime - ] - ++ lib.optionals (!pythonOlder "3.13") [ legacy-cgi ];