azure-cli: 2.52.0 -> 2.53.0
This commit is contained in:
parent
6d882d7f54
commit
17ab378cf0
|
@ -1,14 +1,20 @@
|
||||||
{ stdenv, lib, python3, fetchPypi, fetchFromGitHub, installShellFiles }:
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, python3
|
||||||
|
, fetchPypi
|
||||||
|
, fetchFromGitHub
|
||||||
|
, installShellFiles
|
||||||
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "2.52.0";
|
version = "2.53.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
name = "azure-cli-${version}-src";
|
name = "azure-cli-${version}-src";
|
||||||
owner = "Azure";
|
owner = "Azure";
|
||||||
repo = "azure-cli";
|
repo = "azure-cli";
|
||||||
rev = "azure-cli-${version}";
|
rev = "azure-cli-${version}";
|
||||||
hash = "sha256-wa0LmBMv3eQIsWEKMAHks+TvBZmTdFepPGG5XQRvZXk=";
|
hash = "sha256-5c2Z0EJnKyLqWiz8/BEFAdy5A0+sBbai7UQ2KPL1jr8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# put packages that needs to be overridden in the py package scope
|
# put packages that needs to be overridden in the py package scope
|
||||||
|
@ -28,18 +34,17 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
|
||||||
--replace "chardet~=3.0.4" "chardet" \
|
--replace "chardet~=3.0.4" "chardet" \
|
||||||
--replace "javaproperties~=0.5.1" "javaproperties" \
|
--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"
|
--replace "fabric~=2.4" "fabric"
|
||||||
|
|
||||||
# remove namespace hacks
|
# remove namespace hacks
|
||||||
# remove urllib3 because it was added as 'urllib3[secure]', which doesn't get handled well
|
# remove urllib3 because it was added as 'urllib3[secure]', which doesn't get handled well
|
||||||
sed -i setup.py \
|
sed -i setup.py \
|
||||||
-e '/azure-cli-command_modules-nspkg/d' \
|
|
||||||
-e '/azure-cli-nspkg/d' \
|
|
||||||
-e '/urllib3/d'
|
-e '/urllib3/d'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [
|
||||||
|
installShellFiles
|
||||||
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = with py.pkgs; [
|
propagatedBuildInputs = with py.pkgs; [
|
||||||
azure-appconfiguration
|
azure-appconfiguration
|
||||||
|
@ -128,6 +133,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
|
||||||
azure-mgmt-web
|
azure-mgmt-web
|
||||||
azure-multiapi-storage
|
azure-multiapi-storage
|
||||||
azure-storage-blob
|
azure-storage-blob
|
||||||
|
azure-storage-common
|
||||||
azure-synapse-accesscontrol
|
azure-synapse-accesscontrol
|
||||||
azure-synapse-artifacts
|
azure-synapse-artifacts
|
||||||
azure-synapse-managedprivateendpoints
|
azure-synapse-managedprivateendpoints
|
||||||
|
|
|
@ -1,4 +1,9 @@
|
||||||
{ stdenv, python3, fetchPypi, src, version }:
|
{ stdenv
|
||||||
|
, python3
|
||||||
|
, fetchPypi
|
||||||
|
, src
|
||||||
|
, version
|
||||||
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
buildAzureCliPackage = with py.pkgs; buildPythonPackage;
|
buildAzureCliPackage = with py.pkgs; buildPythonPackage;
|
||||||
|
@ -60,16 +65,10 @@ let
|
||||||
tabulate
|
tabulate
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
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[broker]==1.24.0b1" "msal[broker]" \
|
|
||||||
--replace "packaging>=20.9,<22.0" "packaging"
|
|
||||||
'';
|
|
||||||
nativeCheckInputs = with self; [ pytest ];
|
nativeCheckInputs = with self; [ pytest ];
|
||||||
|
|
||||||
doCheck = stdenv.isLinux;
|
doCheck = stdenv.isLinux;
|
||||||
|
|
||||||
# ignore tests that does network call, or assume powershell
|
# ignore tests that does network call, or assume powershell
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
rm azure/{,cli/}__init__.py
|
rm azure/{,cli/}__init__.py
|
||||||
|
@ -205,8 +204,8 @@ let
|
||||||
azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip"
|
azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip"
|
||||||
"sha256-WVScTEBo8mRmsQl7V0qOUJn7LNbIvgoAOVsG07KeJ40=r";
|
"sha256-WVScTEBo8mRmsQl7V0qOUJn7LNbIvgoAOVsG07KeJ40=r";
|
||||||
|
|
||||||
azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "10.0.0" "zip"
|
azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "10.1.0" "zip"
|
||||||
"sha256-9+cXsY8Qr5ds9lYw39duWdcqm6QUTedQbjn8x6zJoyE=";
|
"sha256-eJiWTOCk2C79Jotku9bKlu3vU6H8004hWrX+h76MjQM=";
|
||||||
|
|
||||||
azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "8.0.0" "zip"
|
azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "8.0.0" "zip"
|
||||||
"sha256-QHwtrLM1E/++nKS+Wt216dS64Mt++mE8P31THve/jeg=";
|
"sha256-QHwtrLM1E/++nKS+Wt216dS64Mt++mE8P31THve/jeg=";
|
||||||
|
@ -351,15 +350,6 @@ let
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
azure-storage-blob = super.azure-storage-blob.overrideAttrs (oldAttrs: rec {
|
|
||||||
version = "1.5.0";
|
|
||||||
src = fetchPypi {
|
|
||||||
inherit (oldAttrs) pname;
|
|
||||||
inherit version;
|
|
||||||
hash = "sha256-8YeoeOehkfTgmBWZBPcrQUbPcOGquvZISrS6cvxvJSw=";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
azure-storage-common = super.azure-storage-common.overrideAttrs (oldAttrs: rec {
|
azure-storage-common = super.azure-storage-common.overrideAttrs (oldAttrs: rec {
|
||||||
version = "1.4.2";
|
version = "1.4.2";
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
|
|
Loading…
Reference in a new issue