From dca9738aac66d9b1e4cd0dfa3d9fa7ed8967330b Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Mar 2025 08:26:29 +0100 Subject: [PATCH] azure-cli: 2.69.0 -> 2.70.0 Signed-off-by: Paul Meyer --- pkgs/by-name/az/azure-cli/package.nix | 6 ++---- pkgs/by-name/az/azure-cli/python-packages.nix | 16 +--------------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix index d32dff3beb37..36adc81b5c16 100644 --- a/pkgs/by-name/az/azure-cli/package.nix +++ b/pkgs/by-name/az/azure-cli/package.nix @@ -26,14 +26,14 @@ }: let - version = "2.69.0"; + version = "2.70.0"; src = fetchFromGitHub { name = "azure-cli-${version}-src"; owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - hash = "sha256-bn6x01fVfn/jNWAN3q2oI3CHt5h575lV9YZp0pgBUxg="; + hash = "sha256-vvX/LkG8qA53AxVlvq7FSTqbVblvE5xbDq4V0SINCAk="; }; # put packages that needs to be overridden in the py package scope @@ -188,7 +188,6 @@ py.pkgs.toPythonApplication ( azure-mgmt-databoxedge azure-mgmt-datalake-store azure-mgmt-datamigration - azure-mgmt-devtestlabs azure-mgmt-dns azure-mgmt-eventgrid azure-mgmt-eventhub @@ -342,7 +341,6 @@ py.pkgs.toPythonApplication ( "azure.mgmt.containerservice" "azure.mgmt.cosmosdb" "azure.mgmt.datamigration" - "azure.mgmt.devtestlabs" "azure.mgmt.dns" "azure.mgmt.eventgrid" "azure.mgmt.eventhub" diff --git a/pkgs/by-name/az/azure-cli/python-packages.nix b/pkgs/by-name/az/azure-cli/python-packages.nix index d99d18df6495..a410f5c47161 100644 --- a/pkgs/by-name/az/azure-cli/python-packages.nix +++ b/pkgs/by-name/az/azure-cli/python-packages.nix @@ -62,6 +62,7 @@ let paramiko pkginfo psutil + py-deviceid pyjwt pyopenssl requests @@ -153,21 +154,6 @@ let }; }); - # ModuleNotFoundError: No module named 'azure.mgmt.containerservice.v2024_09_01' - azure-mgmt-containerservice = super.azure-mgmt-containerservice.overridePythonAttrs (attrs: rec { - version = "33.0.0"; - src = fetchPypi { - pname = "azure_mgmt_containerservice"; # Different from src.pname in the original package. - inherit version; - hash = "sha256-hoWD3NuKSQXeA6hKm3kD12octZrNnDc28CvHQ7UEfJ4="; - }; - }); - - # ValueError: The operation 'azure.mgmt.devtestlabs.operations#VirtualMachinesOperations.delete' is invalid. - azure-mgmt-devtestlabs = - overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip" - "sha256-WVScTEBo8mRmsQl7V0qOUJn7LNbIvgoAOVsG07KeJ40="; - # ImportError: cannot import name 'ResourceSku' from 'azure.mgmt.eventgrid.models' azure-mgmt-eventgrid = overrideAzureMgmtPackage super.azure-mgmt-eventgrid "10.2.0b2" "zip"