From cd6e341249a67821f22093128d33ee41f5a3ddd8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Apr 2025 11:53:44 +0000 Subject: [PATCH 1/4] python312Packages.openstacksdk: 4.4.0 -> 4.5.0 --- pkgs/development/python-modules/openstacksdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openstacksdk/default.nix b/pkgs/development/python-modules/openstacksdk/default.nix index 97c829362e26..c51c06a7286a 100644 --- a/pkgs/development/python-modules/openstacksdk/default.nix +++ b/pkgs/development/python-modules/openstacksdk/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "openstacksdk"; - version = "4.4.0"; + version = "4.5.0"; pyproject = true; outputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-FXQ3Vj1k8/b+7BeW+9hVLVYnczJGF3jE2+dtGCj9MeA="; + hash = "sha256-q3oSQCB6aWm6Cc7ujxZlOAVzBne0SXqAbNlWczZR/mg="; }; postPatch = '' From d70231ac4b19e5509d65542c1e58865c98f32fa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 22 Apr 2025 03:31:25 +0200 Subject: [PATCH 2/4] python313Packages.os-client-config: fix build with openstacksdk 4.5.0, update meta --- .../python-modules/os-client-config/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/os-client-config/default.nix b/pkgs/development/python-modules/os-client-config/default.nix index e06fa9be9f4b..820ee9222dbc 100644 --- a/pkgs/development/python-modules/os-client-config/default.nix +++ b/pkgs/development/python-modules/os-client-config/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + fetchpatch, fetchPypi, fixtures, hacking, @@ -25,6 +26,14 @@ buildPythonPackage rec { hash = "sha256-q8OKNR+MAG009+5fP2SN5ePs9kVcxdds/YidKRzfP04="; }; + patches = [ + # Fix compatibility with openstacksdk 4.5.0 + (fetchpatch { + url = "https://github.com/openstack/os-client-config/commit/46bc2deb4c6762dc1dd674686283eb3fa4c1d5e6.patch"; + hash = "sha256-wZdwCbgrRg0mxs542zjWAlXn0PzCotlbZaEyinYKwb4="; + }) + ]; + build-system = [ setuptools ]; dependencies = [ @@ -54,8 +63,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "os_client_config" ]; meta = with lib; { - homepage = "https://opendev.org/openstack/os-client-config"; - description = "Collect client configuration for using OpenStack in consistent and comprehensive manner"; + description = "Unified config handling for client libraries and programs"; + homepage = "https://github.com/openstack/os-client-config"; license = licenses.asl20; maintainers = teams.openstack.members; }; From 59d5d704c7ed3e206784a9ff4988c49eff8999c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 22 Apr 2025 03:34:22 +0200 Subject: [PATCH 3/4] python313Packages.python-neutronclient: drop iso8601 dependency see https://github.com/openstack/python-neutronclient/commit/370bd215c7fb59822e529ae2a0a136803d40e535 --- .../development/python-modules/python-neutronclient/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/python-neutronclient/default.nix b/pkgs/development/python-modules/python-neutronclient/default.nix index 9aad7913c8d8..697900ca3dcd 100644 --- a/pkgs/development/python-modules/python-neutronclient/default.nix +++ b/pkgs/development/python-modules/python-neutronclient/default.nix @@ -7,7 +7,6 @@ pbr, cliff, debtcollector, - iso8601, netaddr, openstacksdk, osc-lib, @@ -51,7 +50,6 @@ buildPythonPackage rec { dependencies = [ cliff debtcollector - iso8601 netaddr openstacksdk osc-lib From 8d1ab7dfcfe0077d70ad0685bb00367df984a1dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 22 Apr 2025 03:35:53 +0200 Subject: [PATCH 4/4] python313Packages.python-magnumclient: add missing stevedore dependency --- pkgs/development/python-modules/python-magnumclient/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/python-magnumclient/default.nix b/pkgs/development/python-modules/python-magnumclient/default.nix index 3c010d2b12cc..52de2da2cbf0 100644 --- a/pkgs/development/python-modules/python-magnumclient/default.nix +++ b/pkgs/development/python-modules/python-magnumclient/default.nix @@ -24,6 +24,7 @@ setuptools, sphinxHook, stestr, + stevedore, testtools, }: @@ -67,6 +68,7 @@ buildPythonPackage rec { oslo-utils prettytable requests + stevedore ]; nativeCheckInputs = [