Unverified Commit 895be145 authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #296007 from anthonyroussel/upgrade-awscli2 

awscli2: 2.15.15 -> 2.15.31
parents 25390fde 683aa278

pkgs/tools/admin/awscli2/default.nix

+31 −11
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
, groff

, less

, fetchFromGitHub

, fetchpatch

, installShellFiles

, nix-update-script

, testers
@@ -18,6 +19,23 @@ let 
          "test_check_link_response_only" # fails on hydra https://hydra.nixos.org/build/242624087/nixlog/1

        ];

      });

      python-dateutil = prev.python-dateutil.overridePythonAttrs (prev: {

        version = "2.8.2";

        pyproject = null;

        src = prev.src.override {

          version = "2.8.2";

          hash = "sha256-ASPKzBYnrhnd88J6XeW9Z+5FhvvdZEDZdI+Ku0g9PoY=";

        };

        patches = [

          # https://github.com/dateutil/dateutil/pull/1285

          (fetchpatch {

            url = "https://github.com/dateutil/dateutil/commit/f2293200747fb03d56c6c5997bfebeabe703576f.patch";

            relative = "src";

            hash = "sha256-BVEFGV/WGUz9H/8q+l62jnyN9VDnoSR71DdL+LIkb0o=";

          })

        ];

        postPatch = null;

      });

      ruamel-yaml = prev.ruamel-yaml.overridePythonAttrs (prev: {

        src = prev.src.override {

          version = "0.17.21";
@@ -41,27 +59,26 @@ let 
in

with py.pkgs; buildPythonApplication rec {

  pname = "awscli2";

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

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

  pyproject = true;



  src = fetchFromGitHub {

    owner = "aws";

    repo = "aws-cli";

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

    hash = "sha256-hJuJkCiKgSxfPVgS5II7BwpyQhjaRE2Ct3ZJQq6xWgg=";

    hash = "sha256-7qeB3NCYQi7Mke/ZCGe8QUS5qy26btpGjhY/FMNhdkE=";

  };



  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.19.18,<=0.19.19' 'awscrt>=0.19.18' \

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

      --replace 'prompt-toolkit>=3.0.24,<3.0.39' 'prompt-toolkit>=3.0.24'

      --replace-fail 'awscrt>=0.19.18,<=0.19.19' 'awscrt>=0.19.18' \

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

      --replace-fail 'distro>=1.5.0,<1.9.0' 'distro>=1.5.0' \

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

      --replace-fail 'prompt-toolkit>=3.0.24,<3.0.39' 'prompt-toolkit>=3.0.24'



    substituteInPlace requirements-base.txt \

      --replace "wheel==0.38.4" "wheel>=0.38.4" \

      --replace "flit_core==3.8.0" "flit_core>=3.8.0"

      --replace-fail "wheel==0.38.4" "wheel>=0.38.4"



    # Upstream needs pip to build and install dependencies and validates this

    # with a configure script, but we don't as we provide all of the packages
@@ -69,12 +86,12 @@ with py.pkgs; buildPythonApplication rec { 
    sed -i '/pip>=/d' requirements/bootstrap.txt

  '';



  nativeBuildInputs = [

  build-system = [

    installShellFiles

    flit-core

  ];



  propagatedBuildInputs = [

  dependencies = [

    awscrt

    bcdoc

    botocore
@@ -116,6 +133,9 @@ with py.pkgs; buildPythonApplication rec { 
  ];



  disabledTestPaths = [

    "tests/dependencies"

    "tests/unit/botocore"



    # Integration tests require networking

    "tests/integration"