diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-27 15:09:19 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-27 15:09:19 +0100 |
commit | b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf (patch) | |
tree | 220c385a8657d85bb6b305819a1842a3b1f4079c /pkgs/tools/admin/awscli | |
parent | 977848375167f4671a03ccc0dbf5896f4cf0d3fe (diff) | |
parent | be36f6f0a0ffbeef228a021f5a343f5ce7a183de (diff) | |
download | nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.gz nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.bz2 nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.lz nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.xz nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.zst nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/admin/awscli')
-rw-r--r-- | pkgs/tools/admin/awscli/default.nix | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 7c78587a05e..8bf242561b1 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -1,4 +1,5 @@ { lib +, nixosTests , python3 , groff , less @@ -14,16 +15,24 @@ let sha256 = "25df4e10c263fb88b5ace923dd84bf9aa7f5019687b5e55382ffcdb8bede9db5"; }; }); + # TODO: https://github.com/aws/aws-cli/pull/5712 + colorama = super.colorama.overridePythonAttrs (oldAttrs: rec { + version = "0.4.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "189n8hpijy14jfan4ha9f5n06mnl33cxz7ay92wjqgkr639s0vg9"; + }; + }); }; }; in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.18.150"; # N.B: if you change this, change botocore to a matching version too + version = "1.18.185"; # N.B: if you change this, change botocore to a matching version too src = fetchPypi { inherit pname version; - sha256 = "0jrxzr4dx2s6ychmrz19yz8i4kqcwj7f8ly82ydwvrr0ff62374g"; + sha256 = "0yf8dmjgiib5s4dimc1896zxrrj0sl5kzrp7x8spm6xkcvwb02l1"; }; postPatch = '' @@ -56,7 +65,11 @@ in with py.pkgs; buildPythonApplication rec { rm $out/bin/aws.cmd ''; - passthru.python = py; # for aws_shell + passthru = { + python = py; # for aws_shell + + tests = { inherit (nixosTests) awscli; }; + }; meta = with lib; { homepage = "https://aws.amazon.com/cli/"; |