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

azure-cli: 2.17.0 -> 2.17.1

Browse Source
This commit is contained in:
Jonathan Ringer 2021-01-11 16:44:47 -08:00 committed by Jonathan Ringer
parent c7761ec220
commit c0f8f2de40
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/admin/azure-cli/default.nix
View File

@ -1,12 +1,14 @@
{ stdenv, lib, python3, fetchFromGitHub, installShellFiles }: { stdenv, lib, python3, fetchFromGitHub, installShellFiles }:
let let
version = "2.17.0"; version = "2.17.1";
srcName = "azure-cli-${version}-src";
src = fetchFromGitHub { src = fetchFromGitHub {
name = srcName;
owner = "Azure"; owner = "Azure";
repo = "azure-cli"; repo = "azure-cli";
rev = "azure-cli-${version}"; rev = "azure-cli-${version}";
sha256 = "2QLPtZYZZ+W5xZH2hxFnjox31v3My3zocouqLWGWSYI="; sha256 = "sha256-RTYCsdoZx1YQa9a8ZyvwQ9yTLEB6r7/mMgfecc/vGvM=";
}; };
# put packages that needs to be overriden in the py package scope # put packages that needs to be overriden in the py package scope
@ -19,7 +21,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
pname = "azure-cli"; pname = "azure-cli";
inherit version src; inherit version src;
sourceRoot = "source/src/azure-cli"; sourceRoot = "${srcName}/src/azure-cli";
prePatch = '' prePatch = ''
substituteInPlace setup.py \ substituteInPlace setup.py \

24
pkgs/tools/admin/azure-cli/python-packages.nix
View File

@ -52,7 +52,7 @@ let
pname = "azure-cli-core"; pname = "azure-cli-core";
inherit version src; inherit version src;
sourceRoot = "source/src/azure-cli-core"; sourceRoot = "${src.name}/src/azure-cli-core";
propagatedBuildInputs = with self; [ propagatedBuildInputs = with self; [
adal adal
@ -111,7 +111,7 @@ let
version = "1.0.4"; # might be wrong, but doesn't really matter version = "1.0.4"; # might be wrong, but doesn't really matter
inherit src; inherit src;
sourceRoot = "source/src/azure-cli-telemetry"; sourceRoot = "${src.name}/src/azure-cli-telemetry";
propagatedBuildInputs = with super; [ propagatedBuildInputs = with super; [
applicationinsights applicationinsights
@ -209,6 +209,9 @@ let
azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "17.0.0" "zip" azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "17.0.0" "zip"
"3694f2675e152afccb1588a6cc7bb4b4795d442a4e5d7082cdf1f4e32a779199"; "3694f2675e152afccb1588a6cc7bb4b4795d442a4e5d7082cdf1f4e32a779199";
azure-mgmt-marketplaceordering = overrideAzureMgmtPackage super.azure-mgmt-marketplaceordering "0.1.0" "zip"
"sha256-baEkJcurDMYvJG5yZrTWev9r3QMey+UMdULC8rJECtQ=";
azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "2.1.0" "zip" azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "2.1.0" "zip"
"1py0hch0wghzfxazdrrs7p0kln2zn9jh3fmkzwd2z8qggj38q6gm"; "1py0hch0wghzfxazdrrs7p0kln2zn9jh3fmkzwd2z8qggj38q6gm";
@ -393,6 +396,23 @@ let
''; '';
}); });
azure-mgmt-datalake-store = super.azure-mgmt-datalake-store.overrideAttrs(oldAttrs: rec {
version = "0.5.0";
src = super.fetchPypi {
inherit (oldAttrs) pname;
inherit version;
sha256 = "sha256-k3bTVJVmHRn4rMVgT2ewvFlJOxg1u8SA+aGVL5ABekw=";
extension = "zip";
};
preBuild = ''
rm azure_bdist_wheel.py
substituteInPlace setup.cfg \
--replace "azure-namespace-package = azure-mgmt-datalake-nspkg" ""
'';
});
knack = super.knack.overridePythonAttrs(oldAttrs: rec { knack = super.knack.overridePythonAttrs(oldAttrs: rec {
version = "0.7.2"; version = "0.7.2";