diff options
author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
---|---|---|
committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/tools/admin/awscli/default.nix | |
parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/tools/admin/awscli/default.nix')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/tools/admin/awscli/default.nix | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/awscli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/awscli/default.nix index 79d6f42628f3..8bf242561b1c 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/admin/awscli/default.nix +++ b/infra/libkookie/nixpkgs/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 = '' @@ -47,14 +56,20 @@ in with py.pkgs; buildPythonApplication rec { ]; postInstall = '' - mkdir -p $out/etc/bash_completion.d - echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli + mkdir -p $out/share/bash-completion/completions + echo "complete -C $out/bin/aws_completer aws" > $out/share/bash-completion/completions/awscli + mkdir -p $out/share/zsh/site-functions mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions + 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/"; |