From 1344a0f515518bd57b3732a2b8d5b609dd0fa6d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 8 Jul 2024 05:32:33 -0700 Subject: [PATCH 1/3] python313Packages.legacy-cgi: init at 2.6.1 --- .../python-modules/legacy-cgi/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/legacy-cgi/default.nix diff --git a/pkgs/development/python-modules/legacy-cgi/default.nix b/pkgs/development/python-modules/legacy-cgi/default.nix new file mode 100644 index 000000000000..e7c3e0a198d3 --- /dev/null +++ b/pkgs/development/python-modules/legacy-cgi/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "legacy-cgi"; + version = "2.6.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jackrosenthal"; + repo = "legacy-cgi"; + rev = "refs/tags/v${version}"; + hash = "sha256-hhWZoRswkuwvgkcKthNhMkPPhhoRH4TjdNp+orluQTQ="; + }; + + build-system = [ poetry-core ]; + + pythonImportsCheck = [ + "cgi" + "cgitb" + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "Fork of the standard library cgi and cgitb modules, being deprecated in PEP-594"; + homepage = "https://github.com/jackrosenthal/legacy-cgi"; + license = lib.licenses.psfl; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 39b8b28be828..e1ea83c6c9b2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6687,6 +6687,8 @@ self: super: with self; { inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; }; + legacy-cgi = callPackage ../development/python-modules/legacy-cgi { }; + leidenalg = callPackage ../development/python-modules/leidenalg { igraph-c = pkgs.igraph; }; From 5922945c861a8f0b3e607fb091a9ae7d8a96014b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 8 Jul 2024 05:37:08 -0700 Subject: [PATCH 2/3] python312Packages.time-machine: 2.13.0 -> 2.14.2 Diff: https://github.com/adamchainz/time-machine/compare/2.13.0...2.14.2 Changelog: https://github.com/adamchainz/time-machine/blob/2.14.2/CHANGELOG.rst --- pkgs/development/python-modules/time-machine/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/time-machine/default.nix b/pkgs/development/python-modules/time-machine/default.nix index 8d2490f428e0..17d3827f4853 100644 --- a/pkgs/development/python-modules/time-machine/default.nix +++ b/pkgs/development/python-modules/time-machine/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "time-machine"; - version = "2.13.0"; + version = "2.14.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,12 +21,12 @@ buildPythonPackage rec { owner = "adamchainz"; repo = pname; rev = version; - hash = "sha256-SjenPLLr4JoWK5HAokwgW+bw3mfAZiuDb1N7Za5wtrw="; + hash = "sha256-u5RxNv+hsL+0yxtiWeYHtmMQY7bvb8WY7ipouj+IZJ8="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ python-dateutil ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ]; From b571fd7e526c51fc3cf48354f7a5408e4f4f6103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 8 Jul 2024 05:38:47 -0700 Subject: [PATCH 3/3] python313Packages.webob: fix build The cgi module was removed in Python 3.13 but can be brought back using the legacy-cgi package. --- pkgs/development/python-modules/webob/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/webob/default.nix b/pkgs/development/python-modules/webob/default.nix index 921b75ef0778..05eeb73844b2 100644 --- a/pkgs/development/python-modules/webob/default.nix +++ b/pkgs/development/python-modules/webob/default.nix @@ -2,14 +2,17 @@ lib, buildPythonPackage, fetchPypi, + setuptools, + legacy-cgi, pytestCheckHook, + pythonAtLeast, pythonOlder, }: buildPythonPackage rec { pname = "webob"; version = "1.8.7"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,6 +22,11 @@ buildPythonPackage rec { hash = "sha256-tk71FBvlWc+t5EjwRPpFwiYDUe3Lao72t+AMfc7wwyM="; }; + build-system = [ setuptools ]; + + # https://github.com/Pylons/webob/issues/437 + dependencies = lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "webob" ];