3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #113954 from NeQuissimus/awscli_9SxYnEfIRW4SgWVn

aws-cli: 1.19.5 -> 1.19.12
This commit is contained in:
Robert Schütz 2021-02-23 15:06:37 +01:00 committed by GitHub
commit 0bc76020c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 11 deletions

View file

@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
version = "1.17.5"; # N.B: if you change this, change botocore too
version = "1.17.12"; # N.B: if you change this, change botocore too
src = fetchPypi {
inherit pname version;
sha256 = "sha256-1qr7gE/KK2fGXdp4rYtK/tkB4AQHEgi4TIBNNFrZ67o=";
sha256 = "sha256-YvBs0eenjYqqTlJ8MnZT6abBr0FbWYNgSKkMKKJ+Xwk=";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

View file

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "botocore";
version = "1.20.5"; # N.B: if you change this, change boto3 and awscli to a matching version
version = "1.20.12"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
sha256 = "sha256-BKHfdZaB9fFxrMs1TYY7/tB3TWSk6O41/0mDV1VmCk4=";
sha256 = "sha256-OakjFaF6b4vBkU27Ag9S6SnxjluZpPocXYeF+RNCftg=";
};
propagatedBuildInputs = [

View file

@ -4,7 +4,6 @@
, groff
, less
}:
let
py = python3.override {
packageOverrides = self: super: {
@ -26,21 +25,20 @@ let
};
};
in with py.pkgs; buildPythonApplication rec {
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli";
version = "1.19.5"; # N.B: if you change this, change botocore to a matching version too
version = "1.19.12"; # N.B: if you change this, change botocore to a matching version too
src = fetchPypi {
inherit pname version;
sha256 = "sha256-SwYL2ViwazP2MDZbW9cRThvg6jVOMlkfsbpY6QDsjQY=";
sha256 = "sha256-Tj9+UtYSL5yls7AxV7shABcOMhS12VXlpDNdxz8Ns5w=";
};
# https://github.com/aws/aws-cli/issues/4837
# https://github.com/aws/aws-cli/pull/5887
postPatch = ''
substituteInPlace setup.py \
--replace "docutils>=0.10,<0.16" "docutils>=0.10" \
--replace "PyYAML>=3.10,<5.4" "PyYAML>=3.10"
--replace "docutils>=0.10,<0.16" "docutils>=0.10"
'';
# No tests included