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

Merge pull request #118082 from dotlambda/awscli-1.19.40

Browse Source
This commit is contained in:
Sandro 2021-03-31 03:25:50 +02:00 committed by GitHub
commit cdd3dcde9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
version = "1.17.39"; # N.B: if you change this, change botocore and awscli to a matching version
version = "1.17.40"; # N.B: if you change this, change botocore and awscli to a matching version
src = fetchPypi {
inherit pname version;
sha256 = "sha256-tYFP9ztbj8hgHBtztwZ1gH+c5kcTVi4YOghBWiUW7tQ=";
sha256 = "sha256-7pmbRrLGMOUOewUtbf4iQgOjSNg7AOFoylAAmvDydsE=";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
@ -35,6 +35,8 @@ buildPythonPackage rec {
# Network access
doCheck = false;
pythonImportsCheck = [ "boto3" ];
meta = {
homepage = "https://github.com/boto/boto3";
license = lib.licenses.asl20;

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

@ -1,4 +1,5 @@
{ buildPythonPackage
{ lib
, buildPythonPackage
, fetchPypi
, dateutil
, jmespath
@ -12,11 +13,11 @@
buildPythonPackage rec {
pname = "botocore";
version = "1.20.39"; # N.B: if you change this, change boto3 and awscli to a matching version
version = "1.20.40"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
sha256 = "sha256-KFBtI/+pq/VmbCyQnH7cg6ERLNRP506xpJYN9WFTHpg=";
sha256 = "sha256-ajWpl3zb16g52UjdX549JgwZt93nTgqETJcgaITTu6A=";
};
propagatedBuildInputs = [
@ -37,9 +38,11 @@ buildPythonPackage rec {
# Network access
doCheck = false;
meta = {
pythonImportsCheck = [ "botocore" ];
meta = with lib; {
homepage = "https://github.com/boto/botocore";
license = "bsd";
license = licenses.asl20;
description = "A low-level interface to a growing number of Amazon Web Services";
};
}

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

@ -7,13 +7,6 @@
let
py = python3.override {
packageOverrides = self: super: {
rsa = super.rsa.overridePythonAttrs (oldAttrs: rec {
version = "3.4.2";
src = oldAttrs.src.override {
inherit version;
sha256 = "25df4e10c263fb88b5ace923dd84bf9aa7f5019687b5e55382ffcdb8bede9db5";
};
});
# TODO: https://github.com/aws/aws-cli/pull/5712
colorama = super.colorama.overridePythonAttrs (oldAttrs: rec {
version = "0.4.3";
@ -28,11 +21,11 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli";
version = "1.19.39"; # N.B: if you change this, change botocore and boto3 to a matching version too
version = "1.19.40"; # N.B: if you change this, change botocore and boto3 to a matching version too
src = fetchPypi {
inherit pname version;
sha256 = "sha256-qX8ThQwvwc5wGud5Q4KqO24kGdqvi3oK7K71O5aeJeQ=";
sha256 = "sha256-J1IuTA/DrBCDclRA3cjAU71Um4Eygjgo+rMTyvT/my4=";
};
# https://github.com/aws/aws-cli/issues/4837