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/awscli2/default.nix | |
parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/tools/admin/awscli2/default.nix')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/tools/admin/awscli2/default.nix | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/awscli2/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/awscli2/default.nix index e89df04e3bd1..a477beac5a0f 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/admin/awscli2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/awscli2/default.nix @@ -8,12 +8,12 @@ let py = python3.override { packageOverrides = self: super: { botocore = super.botocore.overridePythonAttrs (oldAttrs: rec { - version = "2.0.0dev58"; + version = "2.0.0dev75"; src = fetchFromGitHub { owner = "boto"; repo = "botocore"; - rev = "2d65a1bdf85d24b40a40bc681b44d167ce1cc8cb"; - hash = "sha256-HPeNWLhNFjRoD4TZ54ZGgJPp8fsnh8Rt6DMJ8Q0nPkY="; + rev = "1a4caa8d1c232e9463febec406a8fedc71cb065c"; + sha256 = "0z2c9i2ci3f8979si8gcgnsz44ylchjax1f3dhj7pzyb2kcw6zri"; }; }); prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec { @@ -29,16 +29,17 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.0.54"; # N.B: if you change this, change botocore to a matching version too + version = "2.1.7"; # N.B: if you change this, change botocore to a matching version too src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - hash = "sha256-RVF9/2s5oy3Re6hdvbhwPf0nXSoizBDwOgtXCc7cwgc="; + sha256 = "0sxdbc8y5yqcvsk2bxkywdh4fsq90vlsmcm45y0sa3rpza64xs3r"; }; postPatch = '' + substituteInPlace setup.py --replace "colorama>=0.2.5,<0.4.4" "colorama>=0.2.5" substituteInPlace setup.py --replace "cryptography>=2.8.0,<=2.9.0" "cryptography>=2.8.0" substituteInPlace setup.py --replace "docutils>=0.10,<0.16" "docutils>=0.10" substituteInPlace setup.py --replace "ruamel.yaml>=0.15.0,<0.16.0" "ruamel.yaml>=0.15.0" @@ -67,10 +68,15 @@ 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/${python3.sitePackages}/awscli/data + ${python3.interpreter} scripts/gen-ac-index --index-location $out/${python3.sitePackages}/awscli/data/ac.index + + mkdir -p $out/share/bash-completion/completions + echo "complete -C $out/bin/aws_completer aws" > $out/share/bash-completion/completions/aws + mkdir -p $out/share/zsh/site-functions mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions + rm $out/bin/aws.cmd ''; |