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

awscli2: 2.1.35 -> 2.2.1

Browse Source
This commit is contained in:
Dave Gallant 2021-05-09 22:35:19 -04:00 committed by Jonathan Ringer
parent 99a7c0ac77
commit cee71902e3
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/tools/admin/awscli2/default.nix
View File

@ -3,12 +3,12 @@ let
py = python3.override { py = python3.override {
packageOverrides = self: super: { packageOverrides = self: super: {
botocore = super.botocore.overridePythonAttrs (oldAttrs: rec { botocore = super.botocore.overridePythonAttrs (oldAttrs: rec {
version = "2.0.0dev103"; version = "2.0.0dev109";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "boto"; owner = "boto";
repo = "botocore"; repo = "botocore";
rev = "e30d580042687a79776fdf93264e80746e08d21f"; rev = "b006ff741d12608a9187b873e276abd1fd8eb707";
sha256 = "sha256-+cTQQO6dPctvf3WZOk8Mgo1eQUdqRdGCcz7jcVhEvNo="; sha256 = "sha256-uU3XVQiwtbBt7cdSwAeHkv6NUbL8kK2Ro44h1GYyA1A=";
}; };
}); });
prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec { prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec {
@ -18,19 +18,26 @@ let
sha256 = "1nr990i4b04rnlw1ghd0xmgvvvhih698mb6lb6jylr76cs7zcnpi"; sha256 = "1nr990i4b04rnlw1ghd0xmgvvvhih698mb6lb6jylr76cs7zcnpi";
}; };
}); });
s3transfer = super.s3transfer.overridePythonAttrs (oldAttrs: rec {
version = "0.4.2";
src = oldAttrs.src.override {
inherit version;
sha256 = "sha256-ywIvSxZVHt67sxo3fT8JYA262nNj2MXbeXbn9Hcy4bI=";
};
});
}; };
}; };
in in
with py.pkgs; buildPythonApplication rec { with py.pkgs; buildPythonApplication rec {
pname = "awscli2"; pname = "awscli2";
version = "2.1.35"; # N.B: if you change this, change botocore to a matching version too version = "2.2.1"; # N.B: if you change this, change botocore to a matching version too
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aws"; owner = "aws";
repo = "aws-cli"; repo = "aws-cli";
rev = version; rev = version;
sha256 = "sha256-YgzagbbVLlGSPIhck0YaJg3gQGEdoqXtLapN04Q6hLw="; sha256 = "sha256-TafYBkRlPCqewGBMgTfcX8kLtDhSCdiUYK1xXofKrLk=";
}; };
postPatch = '' postPatch = ''
@ -41,10 +48,10 @@ with py.pkgs; buildPythonApplication rec {
substituteInPlace setup.py --replace "wcwidth<0.2.0" "wcwidth" substituteInPlace setup.py --replace "wcwidth<0.2.0" "wcwidth"
''; '';
# No tests included checkInputs = [ jsonschema mock nose ];
doCheck = false;
propagatedBuildInputs = [ propagatedBuildInputs = [
awscrt
bcdoc bcdoc
botocore botocore
colorama colorama
@ -62,6 +69,15 @@ with py.pkgs; buildPythonApplication rec {
wcwidth wcwidth
]; ];
checkPhase = ''
export PATH=$PATH:$out/bin
# https://github.com/NixOS/nixpkgs/issues/16144#issuecomment-225422439
export HOME=$TMP
AWS_TEST_COMMAND=$out/bin/aws python scripts/ci/run-tests
'';
postInstall = '' postInstall = ''
mkdir -p $out/${python3.sitePackages}/awscli/data mkdir -p $out/${python3.sitePackages}/awscli/data
${python3.interpreter} scripts/gen-ac-index --index-location $out/${python3.sitePackages}/awscli/data/ac.index ${python3.interpreter} scripts/gen-ac-index --index-location $out/${python3.sitePackages}/awscli/data/ac.index