diff options
| author | Theodore Ni <3806110+tjni@users.noreply.github.com> | 2023-07-21 18:16:10 -0700 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-07-28 12:14:55 +0200 |
| commit | 50d38ab78d5c5a995d149683e9e1b8a637876601 (patch) | |
| tree | 145b6a3dd01c4486d4d14b7e551748f04f38a1c1 | |
| parent | 438475dac5dba9674cc79b439c0736acf14430e3 (diff) | |
| download | nixpkgs-50d38ab78d5c5a995d149683e9e1b8a637876601.tar nixpkgs-50d38ab78d5c5a995d149683e9e1b8a637876601.tar.gz nixpkgs-50d38ab78d5c5a995d149683e9e1b8a637876601.tar.bz2 nixpkgs-50d38ab78d5c5a995d149683e9e1b8a637876601.tar.lz nixpkgs-50d38ab78d5c5a995d149683e9e1b8a637876601.tar.xz nixpkgs-50d38ab78d5c5a995d149683e9e1b8a637876601.tar.zst nixpkgs-50d38ab78d5c5a995d149683e9e1b8a637876601.zip | |
awscli: 1.27.79 -> 1.29.9
| -rw-r--r-- | pkgs/tools/admin/awscli/default.nix | 36 |
1 files changed, 7 insertions, 29 deletions
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index dc5b34184ad..e65cac675db 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -1,39 +1,17 @@ { lib , python3 -, fetchFromGitHub , fetchPypi , groff , less }: -let - py = python3.override { - packageOverrides = self: super: { - pyyaml = super.pyyaml.overridePythonAttrs rec { - version = "5.4.1"; - src = fetchFromGitHub { - owner = "yaml"; - repo = "pyyaml"; - rev = version; - hash = "sha256-VUqnlOF/8zSOqh6JoEYOsfQ0P4g+eYqxyFTywgCS7gM="; - }; - checkPhase = '' - runHook preCheck - PYTHONPATH="tests/lib3:$PYTHONPATH" ${self.python.interpreter} -m test_all - runHook postCheck - ''; - }; - }; - self = py; - }; -in -with py.pkgs; buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "awscli"; - version = "1.27.79"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.29.9"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - hash = "sha256-A3MVM5MV+PTwR4W2ALrqEtMaFtVAEt8yqkd4ZLsvHGE="; + hash = "sha256-8SmOu79FZESL1Hd15wdd1m1Uewswqaum2y8LOZAl9P8="; }; # https://github.com/aws/aws-cli/issues/4837 @@ -44,11 +22,10 @@ with py.pkgs; buildPythonApplication rec { --replace "rsa>=3.1.2,<4.8" "rsa<5,>=3.1.2" ''; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ botocore bcdoc s3transfer - six colorama docutils rsa @@ -68,14 +45,15 @@ with py.pkgs; buildPythonApplication rec { ''; passthru = { - python = py; # for aws_shell + python = python3; # for aws_shell }; doInstallCheck = true; + installCheckPhase = '' runHook preInstallCheck - $out/bin/aws --version | grep "${py.pkgs.botocore.version}" + $out/bin/aws --version | grep "${python3.pkgs.botocore.version}" $out/bin/aws --version | grep "${version}" runHook postInstallCheck |