From f31855a33970eae699f2e6a2ac0a2ba2a1788cb9 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 16 Mar 2023 13:57:07 +0200 Subject: [PATCH] azure-cli: fix build --- pkgs/tools/admin/azure-cli/default.nix | 4 +++- pkgs/tools/admin/azure-cli/python-packages.nix | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index bd3afcb53213..5b3f087f7018 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -27,7 +27,9 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { substituteInPlace setup.py \ --replace "chardet~=3.0.4" "chardet" \ --replace "javaproperties~=0.5.1" "javaproperties" \ - --replace "scp~=0.13.2" "scp" + --replace "scp~=0.13.2" "scp" \ + --replace "packaging>=20.9,<22.0" "packaging" \ + --replace "fabric~=2.4" "fabric" # remove namespace hacks # remove urllib3 because it was added as 'urllib3[secure]', which doesn't get handled well diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 9450365019da..5417425c06fb 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -62,7 +62,8 @@ let substituteInPlace setup.py \ --replace "requests[socks]~=2.25.1" "requests[socks]~=2.25" \ --replace "cryptography>=3.2,<3.4" "cryptography" \ - --replace "msal-extensions>=0.3.1,<0.4" "msal-extensions" + --replace "msal-extensions>=0.3.1,<0.4" "msal-extensions" \ + --replace "packaging>=20.9,<22.0" "packaging" ''; nativeCheckInputs = with self; [ pytest ]; doCheck = stdenv.isLinux;