From aa09384630fb9a35e340395da98112e334a22518 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 20 Sep 2023 11:06:00 +0200 Subject: [PATCH 1/2] python311Packages.azure-mgmt-iothub: 2.4.0 -> 3.0.0 Changelog: https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-iothub_3.0.0/sdk/iothub/azure-mgmt-iothub/CHANGELOG.md --- .../azure-mgmt-iothub/default.nix | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix index e4e3ae6374c9..8890f65af3af 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix @@ -1,40 +1,44 @@ { lib -, buildPythonPackage -, fetchPypi -, msrest -, msrestazure , azure-common , azure-mgmt-core -, azure-mgmt-nspkg +, buildPythonPackage +, fetchPypi +, isodate , pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "azure-mgmt-iothub"; - version = "2.4.0"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-enpNE5kVyGK+ctrGt1gt6633rNvT9FM76kSQ7prb1Wo="; + hash = "sha256-2vIfyYxoo1PsYWMYwOYr4EyNaJmWC+jCy/mRZzrItyI="; }; propagatedBuildInputs = [ azure-common azure-mgmt-core - msrest - msrestazure + isodate + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; - # has no tests + # Module has no tests doCheck = false; + pythonImportsCheck = [ + "azure.mgmt.iothub" + ]; + meta = with lib; { description = "This is the Microsoft Azure IoTHub Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-iothub_${version}/sdk/iothub/azure-mgmt-iothub/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; }; From 86d1557db7234dadf745e0747645d435536eda50 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 20 Sep 2023 11:09:37 +0200 Subject: [PATCH 2/2] azure-cli: azure-mgmt-iothub override --- pkgs/tools/admin/azure-cli/python-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index fbedd46048f0..e8884e85d97b 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -186,8 +186,10 @@ let azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "1.2.0" "zip" "sha256-XmGIzw+yGYgdaNGZJClFRl531BGsQUH+HESUXGVK6TI="; - azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "2.3.0" "zip" - "sha256-ml+koj52l5o0toAcnsGtsw0tGnO5F/LKq56ovzdmx/A="; + azure-mgmt-iothub = (overrideAzureMgmtPackage super.azure-mgmt-iothub "2.3.0" "zip" + "sha256-ml+koj52l5o0toAcnsGtsw0tGnO5F/LKq56ovzdmx/A=").overridePythonAttrs (attrs: { + propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ]; + }); azure-mgmt-iothubprovisioningservices = overrideAzureMgmtPackage super.azure-mgmt-iothubprovisioningservices "1.1.0" "zip" "sha256-04OoJuff93L62G6IozpmHpEaUbHHHD6nKlkMHVoJvJ4=";