summary refs log tree commit diff
path: root/pkgs/tools/admin
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2022-10-30 11:18:34 +0100
committerVladimír Čunát <v@cunat.cz>2022-10-30 15:44:32 +0100
commit8680e00318eb2590e849832741cceffa2f9afd6d (patch)
tree852b48fdad97657c130532146e2ebfdf5db36fb1 /pkgs/tools/admin
parent082314708cf81fb741f8050e976b8561da466509 (diff)
downloadnixpkgs-8680e00318eb2590e849832741cceffa2f9afd6d.tar
nixpkgs-8680e00318eb2590e849832741cceffa2f9afd6d.tar.gz
nixpkgs-8680e00318eb2590e849832741cceffa2f9afd6d.tar.bz2
nixpkgs-8680e00318eb2590e849832741cceffa2f9afd6d.tar.lz
nixpkgs-8680e00318eb2590e849832741cceffa2f9afd6d.tar.xz
nixpkgs-8680e00318eb2590e849832741cceffa2f9afd6d.tar.zst
nixpkgs-8680e00318eb2590e849832741cceffa2f9afd6d.zip
awscli: drop override for colorama version
The overridden version wouldn't build anymore,
probably after update of the base colorama.
The PR in comment is included our current awscli version,
but we updated colorama past version allowed there already.
Diffstat (limited to 'pkgs/tools/admin')
-rw-r--r--pkgs/tools/admin/awscli/default.nix9
1 files changed, 1 insertions, 8 deletions
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index 3c07316e45c..34fd3e45906 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -7,14 +7,6 @@
 let
   py = python3.override {
     packageOverrides = self: super: {
-      # TODO: https://github.com/aws/aws-cli/pull/5712
-      colorama = super.colorama.overridePythonAttrs (oldAttrs: rec {
-        version = "0.4.3";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "189n8hpijy14jfan4ha9f5n06mnl33cxz7ay92wjqgkr639s0vg9";
-        };
-      });
       pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec {
         version = "5.4.1";
         src = fetchFromGitHub {
@@ -47,6 +39,7 @@ with py.pkgs; buildPythonApplication rec {
   postPatch = ''
     substituteInPlace setup.py \
       --replace "docutils>=0.10,<0.17" "docutils>=0.10" \
+      --replace "colorama>=0.2.5,<0.4.5" "colorama>=0.2.5,<0.5" \
       --replace "rsa>=3.1.2,<4.8" "rsa<5,>=3.1.2"
   '';