From 92ceff55c9ebc5943853b83287f49fd73a909abd Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 6 Aug 2024 09:00:34 +0200 Subject: [PATCH 1/8] azure-cli: 2.62.0 -> 2.63.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-manual.nix | 7 ++----- pkgs/by-name/az/azure-cli/package.nix | 13 ++++--------- pkgs/by-name/az/azure-cli/python-packages.nix | 2 -- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index d4b79640a96b..592d8accb451 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -7,7 +7,6 @@ mkAzExtension, mycli, python3Packages, - python3, }: { @@ -17,9 +16,7 @@ url = "https://azcliprod.blob.core.windows.net/cli-extensions/application_insights-${version}-py2.py3-none-any.whl"; sha256 = "e1fa824eb587e2bec7f4cb4d1c4ce1033ab3d3fac65af42dd6218f673b019cee"; description = "Support for managing Application Insights components and querying metrics, events, and logs from such components"; - propagatedBuildInputs = with python3Packages; [ - isodate - ]; + propagatedBuildInputs = with python3Packages; [ isodate ]; meta.maintainers = with lib.maintainers; [ andreasvoss ]; }; @@ -59,7 +56,7 @@ pymysql setproctitle ]) - ++ [ (mycli.override { inherit python3; }) ]; + ++ [ mycli ]; meta.maintainers = with lib.maintainers; [ obreitwi ]; }; diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix index ab2d5d4d0f51..f7f7f8cb0b26 100644 --- a/pkgs/by-name/az/azure-cli/package.nix +++ b/pkgs/by-name/az/azure-cli/package.nix @@ -7,7 +7,7 @@ fetchFromGitHub, runCommand, installShellFiles, - python311, + python3, writeScriptBin, # Whether to include patches that enable placing certain behavior-defining @@ -21,21 +21,16 @@ }: let - version = "2.62.0"; + version = "2.63.0"; src = fetchFromGitHub { name = "azure-cli-${version}-src"; owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - hash = "sha256-Rb27KRAb50YzTZzMs6n8g04x14ni3rIYAL3c5j/ieRw="; + hash = "sha256-HpWdEZAMnAkB07fnE7IrA0FqpBYKChqojxwAo8RfuQs="; }; - # Pin Python version to 3.11. - # See https://discourse.nixos.org/t/breaking-changes-announcement-for-unstable/17574/53 - # and https://github.com/Azure/azure-cli/issues/27673 - python3 = python311; - # put packages that needs to be overridden in the py package scope py = callPackage ./python-packages.nix { inherit src version python3; }; @@ -74,7 +69,7 @@ let extensions = callPackages ./extensions-generated.nix { inherit mkAzExtension; } // callPackages ./extensions-manual.nix { - inherit mkAzExtension python3; + inherit mkAzExtension; python3Packages = python3.pkgs; }; diff --git a/pkgs/by-name/az/azure-cli/python-packages.nix b/pkgs/by-name/az/azure-cli/python-packages.nix index fc15dc4aba24..7c46ba257210 100644 --- a/pkgs/by-name/az/azure-cli/python-packages.nix +++ b/pkgs/by-name/az/azure-cli/python-packages.nix @@ -1,9 +1,7 @@ { - lib, stdenv, python3, fetchPypi, - fetchpatch, src, version, }: From 0a0d962db06bf0752f64a8fec7d118749e8c05fa Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 6 Aug 2024 09:03:09 +0200 Subject: [PATCH 2/8] azure-cli-extensions.vm-repair: remove Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-generated.nix | 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.nix b/pkgs/by-name/az/azure-cli/extensions-generated.nix index 9519a5e706da..982d7193dfd8 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.nix +++ b/pkgs/by-name/az/azure-cli/extensions-generated.nix @@ -1023,13 +1023,6 @@ sha256 = "0ef7b4bf9ffd0aa1ad5c50e15a343276636bcfe0296e52d2ee5f0b75ce70633d"; description = "Manage virtual WAN, hubs, VPN gateways and VPN sites"; }; - vm-repair = mkAzExtension rec { - pname = "vm-repair"; - version = "1.0.7"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/vm_repair-${version}-py2.py3-none-any.whl"; - sha256 = "989b15053fe19f1dbb37fd4a31720e2a1ca622ecadaaa4b5c568c44e44c20fa6"; - description = "Auto repair commands to fix VMs"; - }; vmware = mkAzExtension rec { pname = "vmware"; version = "6.0.1"; diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index 592d8accb451..821400868ffb 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -62,4 +62,5 @@ # Removed extensions blockchain = throw "The 'blockchain' extension for azure-cli was deprecated upstream"; # Added 2024-04-26 + vm-repair = throw "The 'vm-repair' extension for azure-cli was deprecated upstream"; # Added 2024-08-06 } From bea7f3509684b380d14be9fc5c4d5032bdb8d20a Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 6 Aug 2024 09:03:22 +0200 Subject: [PATCH 3/8] azure-cli-extensions.aks-preview: 7.0.0b2 -> 7.0.0b3 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.nix b/pkgs/by-name/az/azure-cli/extensions-generated.nix index 982d7193dfd8..e0dc3ab17bc6 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.nix +++ b/pkgs/by-name/az/azure-cli/extensions-generated.nix @@ -59,9 +59,9 @@ }; aks-preview = mkAzExtension rec { pname = "aks-preview"; - version = "7.0.0b2"; + version = "7.0.0b3"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-${version}-py2.py3-none-any.whl"; - sha256 = "f2f8aba2abf4252b3e77c2d4245320c025e111d5374bb6c1a57631cd72c42e39"; + sha256 = "04067e9050de7b3560030613232bf51d9ada4b91885285954afe77b3e40ad90a"; description = "Provides a preview for upcoming AKS features"; }; akshybrid = mkAzExtension rec { From d8519bbb79b2ac8536764f00b0f7c776edc1e92a Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 6 Aug 2024 09:03:23 +0200 Subject: [PATCH 4/8] azure-cli-extensions.connectedmachine: 1.0.0b1 -> 1.0.0b2 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.nix b/pkgs/by-name/az/azure-cli/extensions-generated.nix index e0dc3ab17bc6..7b349d266053 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.nix +++ b/pkgs/by-name/az/azure-cli/extensions-generated.nix @@ -227,9 +227,9 @@ }; connectedmachine = mkAzExtension rec { pname = "connectedmachine"; - version = "1.0.0b1"; + version = "1.0.0b2"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/connectedmachine-${version}-py3-none-any.whl"; - sha256 = "f829b171bc489bd1bffea518040acc74608581dae798f4b23bedfe8bf7445383"; + sha256 = "8b8c4340c4c6552e3826220ffb95bf619447675b0469304b71fa80e2e4e31c81"; description = "Microsoft Azure Command-Line Tools ConnectedMachine Extension"; }; connectedvmware = mkAzExtension rec { From e1454b751283372d48fc4aa423f7dd13e9c76b87 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 6 Aug 2024 09:03:23 +0200 Subject: [PATCH 5/8] azure-cli-extensions.hdinsightonaks: 1.0.0b2 -> 1.0.0b3 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.nix b/pkgs/by-name/az/azure-cli/extensions-generated.nix index 7b349d266053..d22299d1d024 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.nix +++ b/pkgs/by-name/az/azure-cli/extensions-generated.nix @@ -514,9 +514,9 @@ }; hdinsightonaks = mkAzExtension rec { pname = "hdinsightonaks"; - version = "1.0.0b2"; + version = "1.0.0b3"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/hdinsightonaks-${version}-py3-none-any.whl"; - sha256 = "c323291952f9ec6014af5f760b26860bd8029aa04cc226fd5996f20726641c59"; + sha256 = "f549b85107b7b83ff64fcfa5c90a5d7e900a5ea2efe76eec9b1f81689e58c365"; description = "Microsoft Azure Command-Line Tools Hdinsightonaks Extension"; }; healthbot = mkAzExtension rec { From 7c2afac7ad8383d29368eeae70445054eb5672d1 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 6 Aug 2024 09:03:23 +0200 Subject: [PATCH 6/8] azure-cli-extensions.scvmm: 1.0.0 -> 1.1.1 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.nix b/pkgs/by-name/az/azure-cli/extensions-generated.nix index d22299d1d024..0a1615013548 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.nix +++ b/pkgs/by-name/az/azure-cli/extensions-generated.nix @@ -864,9 +864,9 @@ }; scvmm = mkAzExtension rec { pname = "scvmm"; - version = "1.0.0"; + version = "1.1.1"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/scvmm-${version}-py2.py3-none-any.whl"; - sha256 = "565aa9d75dd4d276df2f8ffec5311bd2ae16a2d6172d525a7763fc5972b262b7"; + sha256 = "7d704578bc5eb60b8105de0b4a924176581a4cf2fd162b0896d81246f7f73a68"; description = "Microsoft Azure Command-Line Tools SCVMM Extension"; }; self-help = mkAzExtension rec { From 90527b2c9879cb48fddb37f6b2c5c81569efcd56 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 6 Aug 2024 09:03:24 +0200 Subject: [PATCH 7/8] azure-cli-extensions.stack-hci-vm: 1.1.16 -> 1.1.20 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.nix b/pkgs/by-name/az/azure-cli/extensions-generated.nix index 0a1615013548..93dbd2bb776e 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.nix +++ b/pkgs/by-name/az/azure-cli/extensions-generated.nix @@ -913,9 +913,9 @@ }; stack-hci-vm = mkAzExtension rec { pname = "stack-hci-vm"; - version = "1.1.16"; + version = "1.1.20"; url = "https://hciarcvmsstorage.z13.web.core.windows.net/cli-extensions/stack_hci_vm-${version}-py3-none-any.whl"; - sha256 = "6b08c750b3c3898aab17c459ff626210c17ad12f960f2ab89204765a17d530da"; + sha256 = "7de544b8058ab11d9713b551db65aeaec6b8e5832cdadbbf26ccb7a4a282db6b"; description = "Microsoft Azure Command-Line Tools Stack-HCi-VM Extension"; }; standbypool = mkAzExtension rec { From 3761217491dc7cd582b1df00ece06f64f5a598c2 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 6 Aug 2024 09:03:24 +0200 Subject: [PATCH 8/8] azure-cli-extensions.vmware: 6.0.1 -> 7.0.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.nix b/pkgs/by-name/az/azure-cli/extensions-generated.nix index 93dbd2bb776e..0ae0152ab66a 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.nix +++ b/pkgs/by-name/az/azure-cli/extensions-generated.nix @@ -1025,9 +1025,9 @@ }; vmware = mkAzExtension rec { pname = "vmware"; - version = "6.0.1"; + version = "7.0.0"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/vmware-${version}-py2.py3-none-any.whl"; - sha256 = "2e07a4ddf1b244cfe8b63a29b7f82c3ec94294f10bacfe8fd604841d290020b5"; + sha256 = "e0fadce4fc02996443a8e1673d19ebd24383c584ca89bd396ce963e85865ac0d"; description = "Azure VMware Solution commands"; }; webapp = mkAzExtension rec {