diff options
author | Dave Gallant <davegallant@gmail.com> | 2021-05-09 22:35:19 -0400 |
---|---|---|
committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-05-10 00:03:27 -0700 |
commit | cee71902e30979aaaf87ed0acb402f2c457ae7a6 (patch) | |
tree | 8fa491f49cbf1d40f7f28214851eb50bfbffde93 /pkgs/tools/admin/awscli2 | |
parent | 99a7c0ac777f6df12bd7c0d84d9ad561f7796534 (diff) |
awscli2: 2.1.35 -> 2.2.1
Diffstat (limited to 'pkgs/tools/admin/awscli2')
-rw-r--r-- | pkgs/tools/admin/awscli2/default.nix | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index a2ea7bb35db33..eeb511cd31c18 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -3,12 +3,12 @@ let py = python3.override { packageOverrides = self: super: { botocore = super.botocore.overridePythonAttrs (oldAttrs: rec { - version = "2.0.0dev103"; + version = "2.0.0dev109"; src = fetchFromGitHub { owner = "boto"; repo = "botocore"; - rev = "e30d580042687a79776fdf93264e80746e08d21f"; - sha256 = "sha256-+cTQQO6dPctvf3WZOk8Mgo1eQUdqRdGCcz7jcVhEvNo="; + rev = "b006ff741d12608a9187b873e276abd1fd8eb707"; + sha256 = "sha256-uU3XVQiwtbBt7cdSwAeHkv6NUbL8kK2Ro44h1GYyA1A="; }; }); prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec { @@ -18,19 +18,26 @@ let sha256 = "1nr990i4b04rnlw1ghd0xmgvvvhih698mb6lb6jylr76cs7zcnpi"; }; }); + s3transfer = super.s3transfer.overridePythonAttrs (oldAttrs: rec { + version = "0.4.2"; + src = oldAttrs.src.override { + inherit version; + sha256 = "sha256-ywIvSxZVHt67sxo3fT8JYA262nNj2MXbeXbn9Hcy4bI="; + }; + }); }; }; in with py.pkgs; buildPythonApplication rec { 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 { owner = "aws"; repo = "aws-cli"; rev = version; - sha256 = "sha256-YgzagbbVLlGSPIhck0YaJg3gQGEdoqXtLapN04Q6hLw="; + sha256 = "sha256-TafYBkRlPCqewGBMgTfcX8kLtDhSCdiUYK1xXofKrLk="; }; postPatch = '' @@ -41,10 +48,10 @@ with py.pkgs; buildPythonApplication rec { substituteInPlace setup.py --replace "wcwidth<0.2.0" "wcwidth" ''; - # No tests included - doCheck = false; + checkInputs = [ jsonschema mock nose ]; propagatedBuildInputs = [ + awscrt bcdoc botocore colorama @@ -62,6 +69,15 @@ with py.pkgs; buildPythonApplication rec { 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 = '' mkdir -p $out/${python3.sitePackages}/awscli/data ${python3.interpreter} scripts/gen-ac-index --index-location $out/${python3.sitePackages}/awscli/data/ac.index |