summary refs log tree commit diff
path: root/pkgs/tools/admin/awscli2/default.nix
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2021-07-22 10:21:20 -0400
committerGraham Christensen <graham@grahamc.com>2021-07-22 10:21:20 -0400
commitaab3c48aef2260867272bf6797a980e32ccedbe0 (patch)
treed9b54a62139f0952374e76adddb3fc7a5874b083 /pkgs/tools/admin/awscli2/default.nix
parent3ef8465c6d7f59a9cf2757ac38b84bbdbb16a6f3 (diff)
downloadnixpkgs-aab3c48aef2260867272bf6797a980e32ccedbe0.tar
nixpkgs-aab3c48aef2260867272bf6797a980e32ccedbe0.tar.gz
nixpkgs-aab3c48aef2260867272bf6797a980e32ccedbe0.tar.bz2
nixpkgs-aab3c48aef2260867272bf6797a980e32ccedbe0.tar.lz
nixpkgs-aab3c48aef2260867272bf6797a980e32ccedbe0.tar.xz
nixpkgs-aab3c48aef2260867272bf6797a980e32ccedbe0.tar.zst
nixpkgs-aab3c48aef2260867272bf6797a980e32ccedbe0.zip
awscli2: fixup python 3.9 fallout
from the applied patch:

 Replace use of deprecated base64.encodestring()

Replace the uses of deprecated base64.encodestring() in favor
of botocore.compat.encodebytes().  This fixes incompatibility with
Python 3.9 where the former function has finally been removed.
Diffstat (limited to 'pkgs/tools/admin/awscli2/default.nix')
-rw-r--r--pkgs/tools/admin/awscli2/default.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix
index 1ce3cb452b8..d84c1816fec 100644
--- a/pkgs/tools/admin/awscli2/default.nix
+++ b/pkgs/tools/admin/awscli2/default.nix
@@ -1,4 +1,4 @@
-{ lib, python3, groff, less, fetchFromGitHub }:
+{ lib, python3, groff, less, fetchFromGitHub, fetchpatch }:
 let
   py = python3.override {
     packageOverrides = self: super: {
@@ -33,6 +33,13 @@ with py.pkgs; buildPythonApplication rec {
     sha256 = "sha256-LU9Tqzdi8ULZ5y3FbfSXdrip4NcxFkXRCTpVGo05LcM=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/mgorny/aws-cli/commit/85361123d2fa12eaedf912c046ffe39aebdd2bad.patch";
+      sha256 = "sha256-1Rb+/CY7ze1/DbJ6TfqHF01cfI2vixZ1dT91bmHTg/A=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace setup.py \
       --replace "awscrt==0.11.13" "awscrt" \