Skip to content

Commit

Permalink
azure-cli: 2.68.0 -> 2.69.0 (NixOS#381115)
Browse files Browse the repository at this point in the history
  • Loading branch information
@katexochen
katexochen authored Feb 12, 2025
2 parents 8e066cb + 67d7e51 commit 696f200
Show file tree
Hide file tree
Showing 6 changed files with 71 additions and 82 deletions.
93 changes: 43 additions & 50 deletions pkgs/by-name/az/azure-cli/extensions-generated.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
},
"aks-preview": {
"pname": "aks-preview",
"version": "13.0.0b2",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-13.0.0b2-py2.py3-none-any.whl",
"hash": "sha256-lVOEs9+Vbg7vYt5jhV8agVFvfbqpxdqF58b06Zv9erY=",
"version": "13.0.0b5",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-13.0.0b5-py2.py3-none-any.whl",
"hash": "sha256-uB+Vz7PEm28It6DyOEoWJJfWv6wfLC16SV/poGFb4TM=",
"description": "Provides a preview for upcoming AKS features"
},
"akshybrid": {
Expand All @@ -64,9 +64,9 @@
},
"alb": {
"pname": "alb",
"version": "1.0.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/alb-1.0.0-py3-none-any.whl",
"hash": "sha256-sCDNjNPaYpncl4SZ2uRSdot2UcPtjgXy8LMhvZuDVNQ=",
"version": "2.0.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/alb-2.0.0-py3-none-any.whl",
"hash": "sha256-Z9Pbk2dkAqSyFDlpuyD7jsYidiTsUUnTF6GRtX0WqcM=",
"description": "Microsoft Azure Command-Line Tools ALB Extension"
},
"alertsmanagement": {
Expand All @@ -78,9 +78,9 @@
},
"amg": {
"pname": "amg",
"version": "2.5.4",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.5.4-py3-none-any.whl",
"hash": "sha256-4sNSdZJleUc+MzvzgLW57zrhsGLcGIpBzxHX+A7JM0g=",
"version": "2.5.5",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.5.5-py3-none-any.whl",
"hash": "sha256-uCgv54CC2Ed5coMxxWbX1OQLbFNYIh8gRnYM87U/9WU=",
"description": "Microsoft Azure Command-Line Tools Azure Managed Grafana Extension"
},
"amlfs": {
Expand All @@ -92,9 +92,9 @@
},
"apic-extension": {
"pname": "apic-extension",
"version": "1.1.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/apic_extension-1.1.0-py3-none-any.whl",
"hash": "sha256-AeXrQi6EJoOW3bAlEjC907nUdfRj6BM/BBX7Dw4DJAs=",
"version": "1.2.0b1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/apic_extension-1.2.0b1-py3-none-any.whl",
"hash": "sha256-v8y6Jgg9dYCO/GuLEl44il77WC9nuKT9cRnMI43wZaM=",
"description": "Microsoft Azure Command-Line Tools ApicExtension Extension"
},
"appservice-kube": {
Expand Down Expand Up @@ -169,9 +169,9 @@
},
"bastion": {
"pname": "bastion",
"version": "1.3.1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/bastion-1.3.1-py3-none-any.whl",
"hash": "sha256-DMqkBnT8Mp/p+SV/hpwxnGTWyJwChmSm/1NOuu4dxek=",
"version": "1.4.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/bastion-1.4.0-py3-none-any.whl",
"hash": "sha256-G3kYIjI8MiRLO9ug2F6DjzL/V+I13xhIDTDhuq0t3jQ=",
"description": "Microsoft Azure Command-Line Tools Bastion Extension"
},
"billing-benefits": {
Expand Down Expand Up @@ -232,9 +232,9 @@
},
"cosmosdb-preview": {
"pname": "cosmosdb-preview",
"version": "1.1.0b1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-1.1.0b1-py2.py3-none-any.whl",
"hash": "sha256-D8EbL83XXEhoz8Q+xL4ZwhKP0de2FrYeM2TDwaDEwdo=",
"version": "1.2.0b1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-1.2.0b1-py2.py3-none-any.whl",
"hash": "sha256-01tYc3cg2cTa1KDRAOHMoU3bA8heyc4ZdECgbvUPVhE=",
"description": "Microsoft Azure Command-Line Tools Cosmosdb-preview Extension"
},
"costmanagement": {
Expand Down Expand Up @@ -288,9 +288,9 @@
},
"datafactory": {
"pname": "datafactory",
"version": "1.0.2",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/datafactory-1.0.2-py3-none-any.whl",
"hash": "sha256-6hNOKWO3zfK8vVAkSm8aQR2ne9TbfkLIyPllFjjIKsc=",
"version": "1.0.3",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/datafactory-1.0.3-py3-none-any.whl",
"hash": "sha256-ZvQWykXTiKMvuzc4ByUecOIFNH+j6HBWaW7xaTCa6vs=",
"description": "Microsoft Azure Command-Line Tools DataFactoryManagementClient Extension"
},
"datamigration": {
Expand Down Expand Up @@ -337,9 +337,9 @@
},
"devcenter": {
"pname": "devcenter",
"version": "6.2.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/devcenter-6.2.0-py3-none-any.whl",
"hash": "sha256-JPT+sOq8D1Ojjy/7e4Nwd9jWuUNg1o/Dhn8C6Y4PcLc=",
"version": "6.2.3",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/devcenter-6.2.3-py3-none-any.whl",
"hash": "sha256-w0IE25YKaUtrtHzExBn2lEQC8UnXOZkbPMh2czkhAfw=",
"description": "Microsoft Azure Command-Line Tools DevCenter Extension"
},
"diskpool": {
Expand Down Expand Up @@ -582,9 +582,9 @@
},
"k8s-extension": {
"pname": "k8s-extension",
"version": "1.6.2",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_extension-1.6.2-py3-none-any.whl",
"hash": "sha256-hS2nusfLVQF8yEPgX1pw6juS6V3eJZLP6JL+1R41Co8=",
"version": "1.6.3",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_extension-1.6.3-py3-none-any.whl",
"hash": "sha256-NHKwalI003mKt2/WS8q6A7nbjDyKBMQMrng+YPiDAeY=",
"description": "Microsoft Azure Command-Line Tools K8s-extension Extension"
},
"k8s-runtime": {
Expand Down Expand Up @@ -622,13 +622,6 @@
"hash": "sha256-FMGHaMAu6cNwrH7tDyMgbu59NEoQOCowg7F7XhhIz80=",
"description": "Microsoft Azure Command-Line Tools Logic Extension"
},
"logz": {
"pname": "logz",
"version": "0.1.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/logz-0.1.0-py3-none-any.whl",
"hash": "sha256-apN9u4xadYspr9Rez8EBdDpb8kkfL7pg6OpRLVt2WEA=",
"description": "Microsoft Azure Command-Line Tools MicrosoftLogz Extension"
},
"maintenance": {
"pname": "maintenance",
"version": "1.7.0b2",
Expand Down Expand Up @@ -715,9 +708,9 @@
},
"neon": {
"pname": "neon",
"version": "1.0.0b1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/neon-1.0.0b1-py3-none-any.whl",
"hash": "sha256-JA3DOHznnpjq0nt30tAWLHSUyUv6ihfRt4Qa4l5Dajs=",
"version": "1.0.0b2",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/neon-1.0.0b2-py3-none-any.whl",
"hash": "sha256-EUIO1Xjt9RaJ4RFq9YQTO2a1ZqydVs8b5PqyW0ef7AY=",
"description": "Microsoft Azure Command-Line Tools Neon Extension"
},
"network-analytics": {
Expand All @@ -729,10 +722,10 @@
},
"networkcloud": {
"pname": "networkcloud",
"version": "2.0.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-2.0.0-py3-none-any.whl",
"hash": "sha256-8ntKTSkGJwdhHJCeClEd7A0cUgRed8sV/l7qP5jAQhQ=",
"description": "Support for Azure Operator Nexus network cloud commands based on 2024-07-01 API version"
"version": "3.0.0b1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-3.0.0b1-py3-none-any.whl",
"hash": "sha256-YGCfBmwvotljUiwopPmRGLx+4T3NOdp8YySgF9ro+KY=",
"description": "Support for Azure Operator Nexus network cloud commands based on 2024-10-01-preview API version"
},
"new-relic": {
"pname": "new-relic",
Expand All @@ -750,9 +743,9 @@
},
"nginx": {
"pname": "nginx",
"version": "2.0.0b6",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/nginx-2.0.0b6-py2.py3-none-any.whl",
"hash": "sha256-2U93wSzmlFyCP376hCOOOYta7IeBVrvfMRLw3vHriWA=",
"version": "2.0.0b8",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/nginx-2.0.0b8-py2.py3-none-any.whl",
"hash": "sha256-d/ELXpGjr/oR7rnIQqddcWA88X2n5BizhAuWYSNb1JM=",
"description": "Microsoft Azure Command-Line Tools Nginx Extension"
},
"notification-hub": {
Expand All @@ -764,9 +757,9 @@
},
"nsp": {
"pname": "nsp",
"version": "1.0.0b2",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/nsp-1.0.0b2-py3-none-any.whl",
"hash": "sha256-/r/OOPxEnapnx62EEOf6JQ9/Oa+1+HBJbOBFu3STW80=",
"version": "1.0.0b3",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/nsp-1.0.0b3-py3-none-any.whl",
"hash": "sha256-Nsxf4BMEWkvx5od7YsLwQLZdULc5glwtcDC7qClx5T8=",
"description": "Microsoft Azure Command-Line Tools Nsp Extension"
},
"offazure": {
Expand Down Expand Up @@ -876,9 +869,9 @@
},
"resource-graph": {
"pname": "resource-graph",
"version": "2.1.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/resource_graph-2.1.0-py2.py3-none-any.whl",
"hash": "sha256-YsgePWLOYMWgpIWCnQC9sMczFF7pP7YJjBTjsn7ifEA=",
"version": "2.1.1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/resource_graph-2.1.1-py2.py3-none-any.whl",
"hash": "sha256-Q2suhl1/P7a+6izcAXx03UimaZEgmlq43AkkQ+yTFA8=",
"description": "Support for querying Azure resources with Resource Graph"
},
"resource-mover": {
Expand Down
1 change: 1 addition & 0 deletions pkgs/by-name/az/azure-cli/extensions-manual.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,4 +154,5 @@
compute-diagnostic-rp = throw "The 'compute-diagnostic-rp' extension for azure-cli was deprecated upstream"; # Added 2024-11-12, https://github.com/Azure/azure-cli-extensions/pull/8240
connection-monitor-preview = throw "The 'connection-monitor-preview' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8194
deidservice = throw "The 'deidservice' extension for azure-cli was moved under healthcareapis"; # Added 2024-11-19, https://github.com/Azure/azure-cli-extensions/pull/8224
logz = throw "The 'logz' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8459
}
6 changes: 2 additions & 4 deletions pkgs/by-name/az/azure-cli/package.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@
}:

let
version = "2.68.0";
version = "2.69.0";

src = fetchFromGitHub {
name = "azure-cli-${version}-src";
owner = "Azure";
repo = "azure-cli";
rev = "azure-cli-${version}";
hash = "sha256-WJkuLZUWNzbjAmOPilOK6jnjmax/3ct+ZVWQB3ho/BI=";
hash = "sha256-bn6x01fVfn/jNWAN3q2oI3CHt5h575lV9YZp0pgBUxg=";
};

# put packages that needs to be overridden in the py package scope
Expand Down Expand Up @@ -175,7 +175,6 @@ py.pkgs.toPythonApplication (
azure-mgmt-iothub
azure-mgmt-iothubprovisioningservices
azure-mgmt-keyvault
azure-mgmt-kusto
azure-mgmt-loganalytics
azure-mgmt-managedservices
azure-mgmt-managementgroups
Expand Down Expand Up @@ -329,7 +328,6 @@ py.pkgs.toPythonApplication (
"azure.mgmt.iothub"
"azure.mgmt.iothubprovisioningservices"
"azure.mgmt.keyvault"
"azure.mgmt.kusto"
"azure.mgmt.loganalytics"
"azure.mgmt.managedservices"
"azure.mgmt.managementgroups"
Expand Down
25 changes: 9 additions & 16 deletions pkgs/by-name/az/azure-cli/python-packages.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,15 @@ let
meta.downloadPage = "https://github.com/Azure/azure-cli/blob/azure-cli-${version}/src/azure-cli-telemetry/";
};

# AttributeError: type object 'WorkspacesOperations' has no attribute 'begin_delete'
azure-mgmt-batchai =
overrideAzureMgmtPackage super.azure-mgmt-batchai "7.0.0b1" "zip"
"sha256-mT6vvjWbq0RWQidugR229E8JeVEiobPD3XA/nDM3I6Y=";
# Error loading command module 'batch': No module named 'azure.batch._model_base'
azure-batch = super.azure-batch.overridePythonAttrs (attrs: rec {
version = "15.0.0b1";
src = fetchPypi {
pname = "azure_batch"; # Different from src.pname in the original package.
inherit version;
hash = "sha256-373dFY/63lIZPj5NhsmW6nI2/9JpWkNzT65eBal04u0=";
};
});

azure-mgmt-billing =
(overrideAzureMgmtPackage super.azure-mgmt-billing "6.0.0" "zip"
Expand Down Expand Up @@ -173,18 +178,6 @@ let
overrideAzureMgmtPackage super.azure-mgmt-hdinsight "9.0.0b3" "tar.gz"
"sha256-clSeCP8+7T1uI4Nec+zhzDK980C9+JGeeJFsNSwgD2Q=";

# ValueError: The operation 'azure.mgmt.kusto.operations#ClustersOperations.delete' is invalid.
azure-mgmt-kusto =
(overrideAzureMgmtPackage super.azure-mgmt-kusto "0.3.0" "zip"
"sha256-nri3eB/UQQ7p4gfNDDmDuvnlhBS1tKGISdCYVuNrrN4="
).overridePythonAttrs
(attrs: {
propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [
self.msrest
self.msrestazure
];
});

# ValueError: The operation 'azure.mgmt.media.operations#MediaservicesOperations.create_or_update' is invalid.
azure-mgmt-media =
overrideAzureMgmtPackage super.azure-mgmt-media "9.0.0" "zip"
Expand Down
21 changes: 12 additions & 9 deletions pkgs/development/python-modules/azure-mgmt-batchai/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,29 @@
fetchPypi,
azure-common,
azure-mgmt-core,
azure-mgmt-nspkg,
msrestazure,
isodate,
pythonOlder,
typing-extensions,
}:

buildPythonPackage rec {
pname = "azure-mgmt-batchai";
version = "2.0.0";
version = "7.0.0";
format = "setuptools";

disabled = pythonOlder "3.7";

src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "f1870b0f97d5001cdb66208e5a236c9717a0ed18b34dbfdb238a828f3ca2a683";
inherit version;
pname = "azure_mgmt_batchai";
hash = "sha256-XfAE/QyST8ZVlJR6nP9Pdgh97hfIhFM6G7sLINsn06M=";
};

propagatedBuildInputs = [
msrestazure
isodate
azure-common
azure-mgmt-core
azure-mgmt-nspkg
];
] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];

pythonNamespaces = [ "azure.mgmt" ];

Expand All @@ -34,6 +36,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "This is the Microsoft Azure Batch AI Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-batchai_${version}/sdk/batchai/azure-mgmt-batchai/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ maxwilson ];
};
Expand Down
7 changes: 4 additions & 3 deletions pkgs/development/python-modules/azure-mgmt-redis/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@

buildPythonPackage rec {
pname = "azure-mgmt-redis";
version = "14.4.0";
version = "14.5.0";
format = "setuptools";

disabled = pythonOlder "3.7";

src = fetchPypi {
inherit pname version;
hash = "sha256-CIRzJa/wexeuheb+Az0KBaz4z0HMmpzGBiOuLaxGZ+8=";
inherit version;
pname = "azure_mgmt_redis";
hash = "sha256-XDQ0yCSSaI4luTqvURPs/wuSt61toqT9RpVTD4KxUvo=";
};

propagatedBuildInputs = [
Expand Down

0 comments on commit 696f200

Please sign in to comment.