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
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 ];
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"
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 ];
 
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
   ];
 
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
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;
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 ];
 
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
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3df3c206d645..dcfba9316e6c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8185,7 +8185,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; };