From 40054a03725367aad6d611983982145fd5215819 Mon Sep 17 00:00:00 2001 From: Vinetos Date: Mon, 9 Feb 2026 19:55:11 +0100 Subject: [PATCH 1/3] python3Packages.python-openstackclient: fix subpackages builds --- .../python-openstackclient/default.nix | 17 ++++++++++++++++- .../python-openstackclient/fix-pyproject.patch | 18 ++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/python-openstackclient/fix-pyproject.patch diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index 94a5d129c0c7..65f484710ea1 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -44,6 +44,10 @@ buildPythonPackage (finalAttrs: { hash = "sha256-CEz1v4e4NadSZ+qhotFtLB4y/KdhDZbDOohN8D9FB30="; }; + patches = [ + ./fix-pyproject.patch + ]; + env.PBR_VERSION = finalAttrs.version; build-system = [ @@ -79,7 +83,18 @@ buildPythonPackage (finalAttrs: { runHook postCheck ''; - pythonImportsCheck = [ "openstackclient" ]; + pythonImportsCheck = [ + "openstackclient" + "openstackclient.api" + "openstackclient.common" + "openstackclient.compute" + "openstackclient.identity" + "openstackclient.image" + "openstackclient.network" + "openstackclient.object" + "openstackclient.volume" + "openstackclient.tests" + ]; optional-dependencies = { # See https://github.com/openstack/python-openstackclient/blob/master/doc/source/contributor/plugins.rst diff --git a/pkgs/development/python-modules/python-openstackclient/fix-pyproject.patch b/pkgs/development/python-modules/python-openstackclient/fix-pyproject.patch new file mode 100644 index 000000000000..4ce54df89254 --- /dev/null +++ b/pkgs/development/python-modules/python-openstackclient/fix-pyproject.patch @@ -0,0 +1,18 @@ +diff --git a/pyproject.toml b/pyproject.toml +index 37fb8d0c..21571714 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -730,10 +730,9 @@ volume_transfer_request_show = "openstackclient.volume.v3.volume_transfer_reques + volume_summary = "openstackclient.volume.v3.volume:VolumeSummary" + volume_revert = "openstackclient.volume.v3.volume:VolumeRevertToSnapshot" + +-[tool.setuptools] +-packages = [ +- "openstackclient" +-] ++[tool.setuptools.packages.find] ++where = ["."] ++include = ["openstackclient*"] + + [tool.mypy] + python_version = "3.10" From 9206b81b863eb257f0823791c1b07d89863f61c8 Mon Sep 17 00:00:00 2001 From: Vinetos Date: Mon, 9 Feb 2026 20:42:57 +0100 Subject: [PATCH 2/3] python3Packages.python-openstackclient: disabled modules tests for Python 3.14 --- .../python-modules/python-openstackclient/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index 65f484710ea1..dfd971232cdd 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -79,7 +79,7 @@ buildPythonPackage (finalAttrs: { checkPhase = '' runHook preCheck stestr run -E \ - "openstackclient.tests.unit.(volume.v3.test_volume.(TestVolumeCreate|TestVolumeShow)|common.test_module.TestModuleList)" + "openstackclient.tests.unit.common.test_module.TestModuleList.(test_module_list_no_options|test_module_list_all)" runHook postCheck ''; From d34dd186d327d47ab90b260444768b8666dbc04d Mon Sep 17 00:00:00 2001 From: Vinetos Date: Mon, 9 Feb 2026 21:24:11 +0100 Subject: [PATCH 3/3] maintainers: update vinetos --- maintainers/maintainer-list.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d9a30022793e..dc361319e37d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -27968,8 +27968,9 @@ }; vinetos = { name = "vinetos"; - email = "vinetosdev@gmail.com"; + email = "contact+git@vinetos.fr"; github = "vinetos"; + matrix = "@vinetos:matrix.org"; githubId = 10145351; }; vinnymeller = {