gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #332650 from katexochen/azure-cli/63

Browse Source 
azure-cli: 2.62.0 -> 2.63.0; azure-cli-extensions: update package set
This commit is contained in:
Paul Meyer
2024-08-07 07:49:27 +02:00
committed by GitHub
parent 6ff8fec735 3761217491
commit fedebce673
4 changed files with 19 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/az/azure-cli/extensions-generated.nix
+12 -19
View File
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -1023,18 +1023,11 @@
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";
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 {
pkgs/by-name/az/azure-cli/extensions-manual.nix
+3 -5
View File
@@ -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,10 +56,11 @@
pymysql
setproctitle
])
++ [ (mycli.override { inherit python3; }) ];
++ [ mycli ];
meta.maintainers = with lib.maintainers; [ obreitwi ];
};
# 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
}
pkgs/by-name/az/azure-cli/package.nix
+4 -9
View File
@@ -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;
};
pkgs/by-name/az/azure-cli/python-packages.nix
-2
View File
@@ -1,9 +1,7 @@
{
lib,
stdenv,
python3,
fetchPypi,
fetchpatch,
src,
version,
}: