public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
parent 2eef6f0c0b b081d0d211
commit 0bc76020c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/boto3/default.nix
View File

@ -13,11 +13,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "boto3"; 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 { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-1qr7gE/KK2fGXdp4rYtK/tkB4AQHEgi4TIBNNFrZ67o="; sha256 = "sha256-YvBs0eenjYqqTlJ8MnZT6abBr0FbWYNgSKkMKKJ+Xwk=";
}; };
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

4
pkgs/development/python-modules/botocore/default.nix
View File

@ -12,11 +12,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "botocore"; 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 { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-BKHfdZaB9fFxrMs1TYY7/tB3TWSk6O41/0mDV1VmCk4="; sha256 = "sha256-OakjFaF6b4vBkU27Ag9S6SnxjluZpPocXYeF+RNCftg=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

12
pkgs/tools/admin/awscli/default.nix
View File

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