From 000d9c6bc1ec2a944a1b06481bd704fd28c92a33 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 21 Feb 2021 17:20:05 -0500 Subject: [PATCH 1/4] python3Packages.botocore: 1.20.5 -> 1.20.12 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 05c333d93979..065d4409ec1c 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -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 = [ From 9b48ee2f9faa7eb7af32c756b8c5295aff928716 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 21 Feb 2021 17:23:34 -0500 Subject: [PATCH 2/4] python3Packages.boto3: 1.17.5 -> 1.17.12 --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index cfc222d2d2a1..2b256b07f85e 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -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 ]; From e164f21165612b8b128339daee21391486ab75cd Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 21 Feb 2021 17:29:03 -0500 Subject: [PATCH 3/4] awscli: 1.19.5 -> 1.19.12 --- pkgs/tools/admin/awscli/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index defb46b4443c..7dc45b71f231 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -4,7 +4,6 @@ , groff , less }: - let py = python3.override { packageOverrides = self: super: { @@ -26,13 +25,14 @@ 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 From b081d0d21145127f600c393f0dd7e874afabfe48 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 22 Feb 2021 12:14:04 -0500 Subject: [PATCH 4/4] awscli: Remove patching PyYaml --- pkgs/tools/admin/awscli/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 7dc45b71f231..a3470214964f 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -36,11 +36,9 @@ with py.pkgs; buildPythonApplication rec { }; # 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