From f179901ab1f2e35b28ace200462d047a33d3ba76 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Sep 2024 15:47:22 +0200 Subject: [PATCH 1/2] python312Packages.packaging-legacy: init at 23.0.post0 Module to support for legacy Python Packaging functionality https://github.com/di/packaging_legacy --- .../packaging-legacy/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/packaging-legacy/default.nix diff --git a/pkgs/development/python-modules/packaging-legacy/default.nix b/pkgs/development/python-modules/packaging-legacy/default.nix new file mode 100644 index 000000000000..1f6b2f314c00 --- /dev/null +++ b/pkgs/development/python-modules/packaging-legacy/default.nix @@ -0,0 +1,43 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + packaging, + pretend, + pytestCheckHook, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "packaging-legacy"; + version = "23.0.post0"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "di"; + repo = "packaging_legacy"; + rev = "refs/tags/${version}"; + hash = "sha256-2TnJjxasC8+c+qHY60e6Jyqhf1nQJfj/tmIA/LvUsT8="; + }; + + build-system = [ setuptools ]; + + dependencies = [ packaging ]; + + nativeCheckInputs = [ + pretend + pytestCheckHook + ]; + + pythonImportsCheck = [ "packaging_legacy" ]; + + meta = { + description = "Module to support for legacy Python Packaging functionality"; + homepage = "https://github.com/di/packaging_legacy"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 49045d27c5b8..2a1e290d46cc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9461,6 +9461,8 @@ self: super: with self; { packaging = callPackage ../development/python-modules/packaging { }; + packaging-legacy = callPackage ../development/python-modules/packaging-legacy { }; + packbits = callPackage ../development/python-modules/packbits { }; packet-python = callPackage ../development/python-modules/packet-python { }; From 522317f121a1cb10317939dbae1507880f8e26f7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Sep 2024 15:50:31 +0200 Subject: [PATCH 2/2] python312Packages.devpi-common: refactor - add missing packaging-legacy --- .../python-modules/devpi-common/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index e83e9d88d724..218db0fe558d 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -2,13 +2,14 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, - setuptools, - setuptools-changelog-shortener, - requests, - tomli, - pytestCheckHook, lazy, + packaging-legacy, + pytestCheckHook, + pythonOlder, + requests, + setuptools-changelog-shortener, + setuptools, + tomli, }: buildPythonPackage rec { @@ -24,14 +25,15 @@ buildPythonPackage rec { hash = "sha256-I1oKmkXJblTGC6a6L3fYVs+Q8aacG+6UmIfp7cA6Qcw="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-changelog-shortener ]; - propagatedBuildInputs = [ - requests + dependencies = [ lazy + packaging-legacy + requests tomli ];