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, }: