From 7b609d9b939971c14678743ea445bdca9314504d Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Sun, 18 Jan 2026 21:41:27 +0100
Subject: [PATCH] awscli2: 2.32.15 -> 2.33.2

Diff: https://github.com/aws/aws-cli/compare/2.32.15...2.33.2

Changelog: https://github.com/aws/aws-cli/blob/2.33.2/CHANGELOG.rst
---
 pkgs/by-name/aw/awscli2/package.nix | 37 +++++++++--------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/pkgs/by-name/aw/awscli2/package.nix b/pkgs/by-name/aw/awscli2/package.nix
index b8a8e5356aa5..7557d14a22b6 100644
--- a/pkgs/by-name/aw/awscli2/package.nix
+++ b/pkgs/by-name/aw/awscli2/package.nix
@@ -18,11 +18,7 @@ let
   py = python3 // {
     pkgs = python3.pkgs.overrideScope (
       final: prev: {
-        sphinx = prev.sphinx.overridePythonAttrs (prev: {
-          disabledTests = prev.disabledTests ++ [
-            "test_check_link_response_only" # fails on hydra https://hydra.nixos.org/build/242624087/nixlog/1
-          ];
-        });
+        # https://github.com/NixOS/nixpkgs/issues/449266
         prompt-toolkit = prev.prompt-toolkit.overridePythonAttrs (prev: rec {
           version = "3.0.51";
           src = prev.src.override {
@@ -30,6 +26,9 @@ let
             hash = "sha256-pNYmjAgnP9nK40VS/qvPR3g+809Yra2ISASWJDdQKrU=";
           };
         });
+
+        # backends/build_system/utils.py cannot parse PEP 440 version
+        # for python-dateutil 2.9.0.post0 (eg. post0)
         python-dateutil = prev.python-dateutil.overridePythonAttrs (prev: rec {
           version = "2.8.2";
           format = "setuptools";
@@ -48,24 +47,6 @@ let
           ];
           postPatch = null;
         });
-        ruamel-yaml = prev.ruamel-yaml.overridePythonAttrs (prev: rec {
-          version = "0.17.21";
-          src = prev.src.override {
-            inherit version;
-            hash = "sha256-i3zml6LyEnUqNcGsQURx3BbEJMlXO+SSa1b/P10jt68=";
-          };
-        });
-        urllib3 = prev.urllib3.overridePythonAttrs (prev: rec {
-          version = "1.26.18";
-          build-system = with final; [
-            setuptools
-          ];
-          postPatch = null;
-          src = prev.src.override {
-            inherit version;
-            hash = "sha256-+OzBu6VmdBNFfFKauVW/jGe0XbeZ0VkGYmFxnjKFgKA=";
-          };
-        });
       }
     );
   };
@@ -73,14 +54,14 @@ let
 in
 py.pkgs.buildPythonApplication rec {
   pname = "awscli2";
-  version = "2.32.15"; # N.B: if you change this, check if overrides are still up-to-date
+  version = "2.33.2"; # N.B: if you change this, check if overrides are still up-to-date
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-cli";
     tag = version;
-    hash = "sha256-TOXoArw33exbMfKBnNSECymYS8hVzPoVOA7PWzbnroc=";
+    hash = "sha256-dAtcYDdrZASrwBjQfnZ4DUR4F5WhY59/UX92QcILavs=";
   };
 
   postPatch = ''
@@ -90,7 +71,8 @@ py.pkgs.buildPythonApplication rec {
       --replace-fail 'distro>=1.5.0,<1.9.0' 'distro>=1.5.0' \
       --replace-fail 'docutils>=0.10,<0.20' 'docutils>=0.10' \
       --replace-fail 'prompt-toolkit>=3.0.24,<3.0.52' 'prompt-toolkit>=3.0.24' \
-      --replace-fail 'ruamel.yaml.clib>=0.2.0,<=0.2.12' 'ruamel.yaml.clib>=0.2.0' \
+      --replace-fail 'ruamel.yaml>=0.15.0,<=0.17.21' 'ruamel.yaml>=0.15.0' \
+      --replace-fail 'ruamel.yaml.clib>=0.2.0,<=0.2.12' 'ruamel.yaml.clib>=0.2.0'
 
     substituteInPlace requirements-base.txt \
       --replace-fail "wheel==0.43.0" "wheel>=0.43.0"
@@ -180,6 +162,9 @@ py.pkgs.buildPythonApplication rec {
     # Requires networking (socket binding not possible in sandbox)
     "test_is_socket"
     "test_is_special_file_warning"
+
+    # Disable slow tests
+    "test_details_disabled_for_choice_wo_details"
   ];
 
   pythonImportsCheck = [