From 5247d2280ab56e9314488ff5abd6612b17f1402f Mon Sep 17 00:00:00 2001 From: dish Date: Thu, 5 Dec 2024 12:28:54 -0500 Subject: [PATCH 1/2] python312Packages.azure-mgmt-reservations: fix dependencies --- .../python-modules/azure-mgmt-reservations/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix index d382ded7d810..e39954b33300 100644 --- a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix @@ -3,9 +3,9 @@ buildPythonPackage, fetchPypi, msrest, - msrestazure, azure-common, azure-mgmt-core, + typing-extensions, pythonOlder, }: @@ -24,10 +24,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ msrest - msrestazure azure-common azure-mgmt-core - ]; + ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; # has no tests doCheck = false; From bf2b5c745b0ccb4229a1fe1ce676277100336234 Mon Sep 17 00:00:00 2001 From: dish Date: Thu, 5 Dec 2024 12:29:06 -0500 Subject: [PATCH 2/2] python312Packages.azure-mgmt-reservations: modernize --- .../azure-mgmt-reservations/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix index e39954b33300..d88fccddc20c 100644 --- a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, msrest, azure-common, azure-mgmt-core, @@ -12,9 +13,7 @@ buildPythonPackage rec { pname = "azure-mgmt-reservations"; version = "2.3.0"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -22,7 +21,9 @@ buildPythonPackage rec { hash = "sha256-BHCFEFst5jfyIEo0hm86belpxW7EygZCBJ8PTqzqHKc="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ msrest azure-common azure-mgmt-core @@ -31,10 +32,10 @@ buildPythonPackage rec { # has no tests doCheck = false; - meta = with lib; { + meta = { description = "This is the Microsoft Azure Reservations Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; - license = licenses.mit; - maintainers = with maintainers; [ maxwilson ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ maxwilson ]; }; }