From 2970e5aaed681aed4a7ecf90d5840b742fe4c5a7 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 19 Nov 2024 13:05:12 +0100 Subject: [PATCH 01/11] python312Packages.azure-mgmt-postgresqlflexibleservers: 1.0.0 -> 1.1.0b1 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- .../azure-mgmt-postgresqlflexibleservers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-postgresqlflexibleservers/default.nix b/pkgs/development/python-modules/azure-mgmt-postgresqlflexibleservers/default.nix index a501e4fd7f25..1fac1a7bfaff 100644 --- a/pkgs/development/python-modules/azure-mgmt-postgresqlflexibleservers/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-postgresqlflexibleservers/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "azure-mgmt-postgresqlflexibleservers"; - version = "1.0.0"; + version = "1.1.0b1"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_postgresqlflexibleservers"; inherit version; - hash = "sha256-5aSpnUCTol+L1w7XZp6d2QRN+LxGOpUUztiMQqkD55E="; + hash = "sha256-X/AkFBzTsgNO4SU8K9h1w8QAoxOoZfnvvoTyVbwE3K0="; }; build-system = [ From 9a04a63f7c8ccc10e857a1b52ed6f6a0dd36ec5a Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 19 Nov 2024 13:05:35 +0100 Subject: [PATCH 02/11] azure-cli: 2.66.0 -> 2.67.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/package.nix | 5 +-- pkgs/by-name/az/azure-cli/python-packages.nix | 31 +++++++++++++++++-- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix index 33b2a2fee37d..82817441cbdb 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.66.0"; + version = "2.67.0"; src = fetchFromGitHub { name = "azure-cli-${version}-src"; owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - hash = "sha256-iWDKvtEvH6ZwK+5Zp9P2fgXP+4f4kXH+xXfBkYmsPl0="; + hash = "sha256-UrWReU9x7n2GqFt+OO9SLo0uAuwQBXUr4rYtTZfHlfY="; }; # put packages that needs to be overridden in the py package scope @@ -148,6 +148,7 @@ py.pkgs.toPythonApplication ( azure-mgmt-containerservice azure-mgmt-cosmosdb azure-mgmt-databoxedge + azure-mgmt-datalake-store azure-mgmt-datamigration azure-mgmt-devtestlabs azure-mgmt-dns diff --git a/pkgs/by-name/az/azure-cli/python-packages.nix b/pkgs/by-name/az/azure-cli/python-packages.nix index cb8a9cfaa3ef..0f6fe086a369 100644 --- a/pkgs/by-name/az/azure-cli/python-packages.nix +++ b/pkgs/by-name/az/azure-cli/python-packages.nix @@ -137,6 +137,26 @@ let overrideAzureMgmtPackage super.azure-mgmt-cdn "12.0.0" "zip" "sha256-t8PuIYkjS0r1Gs4pJJJ8X9cz8950imQtbVBABnyMnd0="; + # ImportError: cannot import name 'ConfigMap' from 'azure.mgmt.containerinstance.models' + azure-mgmt-containerinstance = super.azure-mgmt-containerinstance.overridePythonAttrs (attrs: rec { + version = "10.2.0b1"; + src = fetchPypi { + pname = "azure_mgmt_containerinstance"; # Different from src.pname in the original package. + inherit version; + hash = "sha256-v0u3e9ZoEnDdCnM6o6fD7N+suo5hbTqMO5jM6cSMx8A="; + }; + }); + + # 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" @@ -180,9 +200,14 @@ let "sha256-05PUV8ouAKq/xhGxVEWIzDop0a7WDTV5mGVSC4sv9P4="; # ImportError: cannot import name 'AdvancedThreatProtectionName' from 'azure.mgmt.sql.models' - azure-mgmt-sql = - overrideAzureMgmtPackage super.azure-mgmt-sql "4.0.0b17" "tar.gz" - "sha256-i9VNbYJ3TgzURbtYYrXw+ez4ubK7BH39/EIL5kqb9Xg="; + azure-mgmt-sql = super.azure-mgmt-sql.overridePythonAttrs (attrs: rec { + version = "4.0.0b20"; + src = fetchPypi { + pname = "azure_mgmt_sql"; # Different from src.pname in the original package. + inherit version; + hash = "sha256-mphqHUet4AhmL8aUoRbrGOjbookCHR3Ex+unpOq7aQM="; + }; + }); # ValueError: The operation 'azure.mgmt.sqlvirtualmachine.operations#SqlVirtualMachinesOperations.begin_create_or_update' is invalid. azure-mgmt-sqlvirtualmachine = From 9c8b4e76ded999943944c3aee8f995d12cb06281 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 19 Nov 2024 13:06:14 +0100 Subject: [PATCH 03/11] azure-cli-extensions.aks-preview: 13.0.0b1 -> 13.0.0b2 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 9cf82967cd27..b3add96097dd 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -50,9 +50,9 @@ }, "aks-preview": { "pname": "aks-preview", - "version": "13.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-13.0.0b1-py2.py3-none-any.whl", - "hash": "sha256-V9Ll880ec95QKoV6E5P6TQAVpsrJVaKZFkZ749+5Uss=", + "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=", "description": "Provides a preview for upcoming AKS features" }, "akshybrid": { From dfbfc3eba3bb039a6b5ed1ce2faf766fbe6c2b49 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 19 Nov 2024 13:06:16 +0100 Subject: [PATCH 04/11] azure-cli-extensions.healthcareapis: 0.4.0 -> 1.0.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index b3add96097dd..d849eb6e13e3 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -526,9 +526,9 @@ }, "healthcareapis": { "pname": "healthcareapis", - "version": "0.4.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/healthcareapis-0.4.0-py3-none-any.whl", - "hash": "sha256-ol19V9T9OtzDdYHQrMHWxqRtzQNRkz7TfPup0avWCXg=", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/healthcareapis-1.0.0-py3-none-any.whl", + "hash": "sha256-RSFMiiNWGMw4PjI+PKQ7UxGn00Jb5CUxRyKK/fRLruc=", "description": "Microsoft Azure Command-Line Tools HealthcareApisManagementClient Extension" }, "hpc-cache": { From e3a1939d63750e314baa46e962e590dc22196f4b Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 19 Nov 2024 13:06:17 +0100 Subject: [PATCH 05/11] azure-cli-extensions.devcenter: 6.0.1 -> 6.1.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index d849eb6e13e3..cda8dd225a5e 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -344,9 +344,9 @@ }, "devcenter": { "pname": "devcenter", - "version": "6.0.1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/devcenter-6.0.1-py3-none-any.whl", - "hash": "sha256-JePc3Jy4MkPOsu1qbe3CJ5U8BsthC6lchN3sD3UDIk8=", + "version": "6.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/devcenter-6.1.0-py3-none-any.whl", + "hash": "sha256-OaWjjAv4bu2KsUYXcQrxrlEiiUrnqa2rfHXg7ZxbyB4=", "description": "Microsoft Azure Command-Line Tools DevCenter Extension" }, "diskpool": { From 70a1a9985e18aeaeeb0a4fb56584ce31e7ebb5d7 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 19 Nov 2024 13:06:19 +0100 Subject: [PATCH 06/11] azure-cli-extensions.dns-resolver: 0.2.0 -> 1.0.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index cda8dd225a5e..50bae676197b 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -372,9 +372,9 @@ }, "dns-resolver": { "pname": "dns-resolver", - "version": "0.2.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dns_resolver-0.2.0-py3-none-any.whl", - "hash": "sha256-HEu4IW5QnC8I+nXEWTDsN3doMm8wy5qxJYQqqTUsbi4=", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dns_resolver-1.0.0-py3-none-any.whl", + "hash": "sha256-DdTqcuNTVT8gVFyv8lePy3YqniY3pFamM1ERCOLsAOM=", "description": "Microsoft Azure Command-Line Tools DnsResolverManagementClient Extension" }, "durabletask": { From 832131c9960902c42587ec166c8400f1fafe9cd2 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 19 Nov 2024 13:06:21 +0100 Subject: [PATCH 07/11] azure-cli-extensions.connectedmachine: 1.0.0 -> 1.1.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 50bae676197b..ef0e79e4da71 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -218,9 +218,9 @@ }, "connectedmachine": { "pname": "connectedmachine", - "version": "1.0.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/connectedmachine-1.0.0-py3-none-any.whl", - "hash": "sha256-FJ7q1J0MBG93jqTZnXhEjzgVe4bqWR0e6lRfiJZZZRE=", + "version": "1.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/connectedmachine-1.1.0-py3-none-any.whl", + "hash": "sha256-m3EBWmsEd3De7Yg91AkoV2QcaldPIQfuVYsFNf8pRtg=", "description": "Microsoft Azure Command-Line Tools ConnectedMachine Extension" }, "connectedvmware": { From aa3c25d68ea9b3ba38dca2aaddc0bfb71b471294 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 19 Nov 2024 13:06:23 +0100 Subject: [PATCH 08/11] azure-cli-extensions.mdp: 1.0.0 -> 1.0.1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index ef0e79e4da71..5afe131f6c3b 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -673,9 +673,9 @@ }, "mdp": { "pname": "mdp", - "version": "1.0.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/mdp-1.0.0-py3-none-any.whl", - "hash": "sha256-wKSuGBcQO1SPHZHX4chVKEFdoBaoPUgxVIWXI7+3jYE=", + "version": "1.0.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/mdp-1.0.1-py3-none-any.whl", + "hash": "sha256-kjVGMrc9yxtPrAwhr/EdcLxON2mp7UQK5MwMFm8v2ac=", "description": "Microsoft Azure Command-Line Tools Mdp Extension" }, "microsoft-fabric": { From 018c46d3d93a1e967f8aa82ebcbfde00faa36946 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 19 Nov 2024 13:06:25 +0100 Subject: [PATCH 09/11] azure-cli-extensions.azure-firewall: 1.2.1 -> 1.2.2 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 5afe131f6c3b..f617847dae40 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -141,9 +141,9 @@ }, "azure-firewall": { "pname": "azure-firewall", - "version": "1.2.1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-1.2.1-py2.py3-none-any.whl", - "hash": "sha256-xvttNUPeleAxiLuGuqCNI6eI+xIxpW7aJ92yVYsl13c=", + "version": "1.2.2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-1.2.2-py2.py3-none-any.whl", + "hash": "sha256-EmH9F4kTG4K7QDwb44Wq0FMUD3Wo1pcWS0KwMXzdnVU=", "description": "Manage Azure Firewall resources" }, "azurelargeinstance": { From f1ca5602e7f01a8e0498d3862d25c8a08a04ee3f Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 19 Nov 2024 13:06:26 +0100 Subject: [PATCH 10/11] azure-cli-extensions.amg: 2.5.2 -> 2.5.3 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index f617847dae40..8938965d4508 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -78,9 +78,9 @@ }, "amg": { "pname": "amg", - "version": "2.5.2", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.5.2-py3-none-any.whl", - "hash": "sha256-T/8/ziRGiD+1MDdpUzBiHz+q4Q7/i2AG+x/6M64SxU4=", + "version": "2.5.3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.5.3-py3-none-any.whl", + "hash": "sha256-xrJS464daKWiw7QeXzzicm9WWl7+0GVi7N1GV203IMk=", "description": "Microsoft Azure Command-Line Tools Azure Managed Grafana Extension" }, "amlfs": { From 293c377b42992b75a6e94bf3a2902b66e2f878dc Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 19 Nov 2024 13:06:28 +0100 Subject: [PATCH 11/11] azure-cli-extensions.deidservice: remove Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-generated.json | 7 ------- pkgs/by-name/az/azure-cli/extensions-manual.nix | 1 + 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 8938965d4508..b6e9b9477a59 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -314,13 +314,6 @@ "hash": "sha256-8agBvQw46y6/nC+04LQ6mEcK57QLvNBesqpZbWlXnJ4=", "description": "Microsoft Azure Command-Line Tools DataShareManagementClient Extension" }, - "deidservice": { - "pname": "deidservice", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/deidservice-1.0.0b1-py3-none-any.whl", - "hash": "sha256-FJw581LzrLlcttM70PuWJwMs8BoaoyCsud1xJ0RZfNA=", - "description": "Microsoft Azure Command-Line Tools Deidservice Extension" - }, "deploy-to-azure": { "pname": "deploy-to-azure", "version": "0.2.0", diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index adb3f03ce40c..c207ffc32335 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -150,4 +150,5 @@ blockchain = throw "The 'blockchain' extension for azure-cli was deprecated upstream"; # Added 2024-04-26, https://github.com/Azure/azure-cli-extensions/pull/7370 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 }