Unverified Commit 4f853fbe authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #265949 from anthonyroussel/updates/awscli2 

awscli2: 2.13.28 -> 2.13.33
parents f6bbd0ca 9f668dc7

pkgs/tools/admin/awscli2/default.nix

+13 −15
Original line number Diff line number Diff line 
{ lib

, stdenv

, python3

, groff

, less

, fetchFromGitHub

, installShellFiles

, nix-update-script

, testers

, awscli2
@@ -20,8 +22,8 @@ let 
      urllib3 = prev.urllib3.overridePythonAttrs (prev: {

        format = "setuptools";

        src = prev.src.override {

          version = "1.26.16";

          hash = "sha256-jxNfZQJ1a95rKpsomJ31++h8mXDOyqaQQe3M5/BYmxQ=";

          version = "1.26.18";

          hash = "sha256-+OzBu6VmdBNFfFKauVW/jGe0XbeZ0VkGYmFxnjKFgKA=";

        };

      });

    });
@@ -30,21 +32,21 @@ let 
in

with py.pkgs; buildPythonApplication rec {

  pname = "awscli2";

  version = "2.13.28"; # N.B: if you change this, check if overrides are still up-to-date

  version = "2.13.33"; # N.B: if you change this, check if overrides are still up-to-date

  format = "pyproject";



  src = fetchFromGitHub {

    owner = "aws";

    repo = "aws-cli";

    rev = "refs/tags/${version}";

    hash = "sha256-rl4gBjuCnXfyJMv/2KIeujK0ouR624+AYaVYn4ri1Nk=";

    hash = "sha256-5ANfMa7b72z5E1EH9+dJ9avLDBnSEFGqvDOFFzLbZcM=";

  };



  postPatch = ''

    substituteInPlace pyproject.toml \

      --replace 'cryptography>=3.3.2,<40.0.2' 'cryptography>=3.3.2' \

      --replace 'flit_core>=3.7.1,<3.8.1' 'flit_core>=3.7.1' \

      --replace 'awscrt>=0.16.4,<=0.16.16' 'awscrt>=0.16.4' \

      --replace 'awscrt>=0.16.4,<=0.19.6' 'awscrt>=0.16.4' \

      --replace 'docutils>=0.10,<0.20' 'docutils>=0.10' \

      --replace 'prompt-toolkit>=3.0.24,<3.0.39' 'prompt-toolkit>=3.0.24'
@@ -59,6 +61,7 @@ with py.pkgs; buildPythonApplication rec { 
  '';



  nativeBuildInputs = [

    installShellFiles

    flit-core

  ];
@@ -87,15 +90,10 @@ with py.pkgs; buildPythonApplication rec { 
  ];



  postInstall = ''

    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



    installShellCompletion --cmd aws \

      --bash <(echo "complete -C $out/bin/aws_completer aws") \

      --zsh $out/bin/aws_zsh_completer.sh

  '' + lib.optionalString (!stdenv.hostPlatform.isWindows) ''

    rm $out/bin/aws.cmd

  '';
@@ -136,7 +134,7 @@ with py.pkgs; buildPythonApplication rec { 


  meta = with lib; {

    description = "Unified tool to manage your AWS services";

    homepage = "https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2.html";

    homepage = "https://docs.aws.amazon.com/cli/latest/userguide/";

    changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst";

    license = licenses.asl20;

    maintainers = with maintainers; [ bhipple davegallant bryanasdev000 devusb anthonyroussel ];