diff --git a/pkgs/by-name/aw/awscli/package.nix b/pkgs/by-name/aw/awscli/package.nix
index 73925189d362d..daa7e88c83e9e 100644
--- a/pkgs/by-name/aw/awscli/package.nix
+++ b/pkgs/by-name/aw/awscli/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
-  python3,
-  fetchPypi,
+  python3Packages,
+  fetchFromGitHub,
   groff,
   less,
   nix-update-script,
@@ -10,36 +10,38 @@
 }:
 
 let
-  self = python3.pkgs.buildPythonApplication rec {
+  self = python3Packages.buildPythonApplication rec {
     pname = "awscli";
     # N.B: if you change this, change botocore and boto3 to a matching version too
     # check e.g. https://github.com/aws/aws-cli/blob/1.33.21/setup.py
-    version = "1.36.40";
+    version = "1.37.21";
     pyproject = true;
 
-    src = fetchPypi {
-      inherit pname version;
-      hash = "sha256-4qiPiNwW1cDyY3mv1vJUCX5T6LNMghZOWfQWXbbubfo=";
+    src = fetchFromGitHub {
+      owner = "aws";
+      repo = "aws-cli";
+      tag = version;
+      hash = "sha256-gKRWhOhZjGhPVIG6KgCyDqxuyBGbaS8bHD7vnJ4gA+o=";
     };
 
     pythonRelaxDeps = [
       # botocore must not be relaxed
-      "colorama"
       "docutils"
       "rsa"
     ];
 
-    build-system = [
-      python3.pkgs.setuptools
+    build-system = with python3Packages; [
+      setuptools
     ];
 
-    dependencies = with python3.pkgs; [
+    dependencies = with python3Packages; [
       botocore
+      docutils
       s3transfer
+      pyyaml
       colorama
-      docutils
       rsa
-      pyyaml
+
       groff
       less
     ];
@@ -59,14 +61,14 @@ let
     installCheckPhase = ''
       runHook preInstallCheck
 
-      $out/bin/aws --version | grep "${python3.pkgs.botocore.version}"
+      $out/bin/aws --version | grep "${python3Packages.botocore.version}"
       $out/bin/aws --version | grep "${version}"
 
       runHook postInstallCheck
     '';
 
     passthru = {
-      python = python3; # for aws_shell
+      python = python3Packages.python; # for aws_shell
       updateScript = nix-update-script {
         extraArgs = [ "--version=skip" ];
       };
diff --git a/pkgs/development/python-modules/aioboto3/default.nix b/pkgs/development/python-modules/aioboto3/default.nix
index 469573ab4da82..e96167296eab1 100644
--- a/pkgs/development/python-modules/aioboto3/default.nix
+++ b/pkgs/development/python-modules/aioboto3/default.nix
@@ -13,12 +13,11 @@
   pytest-asyncio,
   pytestCheckHook,
   pythonOlder,
-  requests,
 }:
 
 buildPythonPackage rec {
   pname = "aioboto3";
-  version = "13.1.1";
+  version = "13.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -27,16 +26,18 @@ buildPythonPackage rec {
     owner = "terrycain";
     repo = "aioboto3";
     tag = "v${version}";
-    hash = "sha256-g86RKQxTcfG1CIH3gfgn9Vl9JxUkeC1ztmLk4q/MVn0=";
+    hash = "sha256-o3PynPW6nPvbBrsw+HU2fJheVRpCHCb0EnJdmseorsE=";
   };
 
+  pythonRelaxDeps = [
+    "aiobotocore"
+  ];
+
   build-system = [
     poetry-core
     poetry-dynamic-versioning
   ];
 
-  pythonRelaxDeps = [ "aiobotocore" ];
-
   dependencies = [
     aiobotocore
     aiofiles
@@ -47,31 +48,23 @@ buildPythonPackage rec {
     s3cse = [ cryptography ];
   };
 
-  nativeCheckInputs = [
-    dill
-    moto
-    pytest-asyncio
-    pytestCheckHook
-    requests
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  nativeCheckInputs =
+    [
+      dill
+      moto
+      pytest-asyncio
+      pytestCheckHook
+    ]
+    ++ moto.optional-dependencies.server
+    ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "aioboto3" ];
 
-  disabledTests = [
-    # Our moto package is not ready to support more tests
-    "encrypt_decrypt_aes_cbc"
-    "test_chalice_async"
-    "test_dynamo"
-    "test_flush_doesnt_reset_item_buffer"
-    "test_kms"
-    "test_s3"
-  ];
-
-  meta = with lib; {
+  meta = {
     description = "Wrapper to use boto3 resources with the aiobotocore async backend";
     homepage = "https://github.com/terrycain/aioboto3";
     changelog = "https://github.com/terrycain/aioboto3/blob/${src.rev}/CHANGELOG.rst";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ mbalatsko ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ mbalatsko ];
   };
 }
diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix
index 99c5e93203985..75cbc510ccf0f 100644
--- a/pkgs/development/python-modules/aiobotocore/default.nix
+++ b/pkgs/development/python-modules/aiobotocore/default.nix
@@ -1,27 +1,30 @@
 {
   lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonOlder,
   aiohttp,
   aioitertools,
   botocore,
-  buildPythonPackage,
+  python-dateutil,
+  jmespath,
+  multidict,
+  urllib3,
+  wrapt,
   dill,
-  fetchFromGitHub,
-  flask,
-  flask-cors,
-  awscli,
   moto,
+  pytest-asyncio,
+  time-machine,
+  werkzeug,
+  awscli,
   boto3,
   setuptools,
-  pytest-asyncio,
   pytestCheckHook,
-  pythonAtLeast,
-  pythonOlder,
-  wrapt,
 }:
 
 buildPythonPackage rec {
   pname = "aiobotocore";
-  version = "2.18.0";
+  version = "2.19.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -30,19 +33,25 @@ buildPythonPackage rec {
     owner = "aio-libs";
     repo = "aiobotocore";
     tag = version;
-    hash = "sha256-4S0CZtk5k+xke2WVwYrNyvP2up32xrOcdKNP72kO6zQ=";
+    hash = "sha256-8wtWIkGja4zb2OoYALH9hTR6i90sIjIjYWTUulfYIYA=";
   };
 
   # Relax version constraints: aiobotocore works with newer botocore versions
   # the pinning used to match some `extras_require` we're not using.
   pythonRelaxDeps = [ "botocore" ];
 
-  build-system = [ setuptools ];
+  build-system = [
+    setuptools
+  ];
 
   dependencies = [
     aiohttp
     aioitertools
     botocore
+    python-dateutil
+    jmespath
+    multidict
+    urllib3
     wrapt
   ];
 
@@ -53,57 +62,40 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     dill
-    flask
-    flask-cors
     moto
     pytest-asyncio
+    time-machine
+    werkzeug
     pytestCheckHook
-  ];
+  ] ++ moto.optional-dependencies.server;
 
   pythonImportsCheck = [ "aiobotocore" ];
 
   disabledTestPaths = [
-    # Tests require network access
-    "tests/python3.8/"
+    # Test requires network access
+    "tests/test_version.py"
+    # Test not compatible with latest moto
+    "tests/boto_tests/unit/test_eventstream.py"
+    "tests/python3.8/test_eventstreams.py"
     "tests/test_basic_s3.py"
     "tests/test_batch.py"
     "tests/test_dynamodb.py"
     "tests/test_ec2.py"
-    "tests/test_eventstreams.py"
     "tests/test_lambda.py"
     "tests/test_monitor.py"
-    "tests/test_mturk.py"
     "tests/test_patches.py"
     "tests/test_sns.py"
     "tests/test_sqs.py"
-    "tests/test_version.py"
     "tests/test_waiter.py"
-    # moto compat issues
-    "tests/boto_tests/unit/test_signers.py"
   ];
 
-  disabledTests =
-    [
-      "test_get_credential"
-      "test_load_sso_credentials_without_cache"
-      "test_load_sso_credentials"
-      "test_required_config_not_set"
-      "test_sso_cred_fetcher_raises_helpful_message_on_unauthorized_exception"
-      "test_sso_credential_fetcher_can_fetch_credentials"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.12.") [
-      # AttributeError: 'called_with' is not a valid assertion. Use a spec for the mock if 'called_with' is meant to be an attribute.
-      "test_max_rate_updated_on_success_response"
-      "test_max_rate_cant_exceed_20_percent_max"
-    ];
-
   __darwinAllowLocalNetworking = true;
 
-  meta = with lib; {
+  meta = {
     description = "Python client for amazon services";
     homepage = "https://github.com/aio-libs/aiobotocore";
     changelog = "https://github.com/aio-libs/aiobotocore/releases/tag/${src.tag}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ teh ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ teh ];
   };
 }
diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index eb783eff89316..ad414dbdecae8 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -25,12 +25,12 @@ buildPythonPackage rec {
     owner = "boto";
     repo = "boto3";
     tag = version;
-    hash = "sha256-b08tC8EA6iW0O/7rseD9pTkKh/cJ2fe3xJZkEqxS6VI=";
+    hash = "sha256-89GUr0isFEKmBevWgPW5z4uU1zOTQ1kM8RX1mlsvdXw=";
   };
 
-  build-system = [ setuptools ];
-
-  pythonRelaxDeps = [ "s3transfer" ];
+  build-system = [
+    setuptools
+  ];
 
   dependencies = [
     botocore
@@ -51,7 +51,7 @@ buildPythonPackage rec {
   ];
 
   optional-dependencies = {
-    crt = [ botocore.optional-dependencies.crt ];
+    crt = botocore.optional-dependencies.crt;
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index a16af885a508f..41709defbe1c4 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -2,7 +2,7 @@
   lib,
   awscrt,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
 
   # build-system
   setuptools,
@@ -19,17 +19,19 @@
 
 buildPythonPackage rec {
   pname = "botocore";
-  version = "1.35.99"; # N.B: if you change this, change boto3 and awscli to a matching version
+  version = "1.36.21"; # N.B: if you change this, change boto3 and awscli to a matching version
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-HqtE6WnDnF89mjEEoINsJHFVeaRV8Ss5eaMdfN5Rs8M=";
+  src = fetchFromGitHub {
+    owner = "boto";
+    repo = "botocore";
+    tag = version;
+    hash = "sha256-wk3KCRagEju4ywJfoBR8/4dH3xYgzGgaSHavDYCd5XY=";
   };
 
-  pythonRelaxDeps = [ "urllib3" ];
-
-  build-system = [ setuptools ];
+  build-system = [
+    setuptools
+  ];
 
   dependencies = [
     jmespath
diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix
index f50260858afdb..15da101a6dec5 100644
--- a/pkgs/development/python-modules/fsspec/default.nix
+++ b/pkgs/development/python-modules/fsspec/default.nix
@@ -1,47 +1,51 @@
 {
   lib,
   stdenv,
-  aiohttp,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
   hatchling,
   hatch-vcs,
-  numpy,
-  paramiko,
-  pytest-asyncio,
-  pytest-mock,
-  pytest-vcr,
-  pytestCheckHook,
-  pythonOlder,
-  requests,
-  smbprotocol,
-  tqdm,
+
+  # optional-dependencies
   adlfs,
+  pyarrow,
   dask,
   distributed,
+  requests,
   dropbox,
+  aiohttp,
   fusepy,
   gcsfs,
   libarchive-c,
   ocifs,
   panel,
-  pyarrow,
+  paramiko,
   pygit2,
   s3fs,
+  smbprotocol,
+  tqdm,
+
+  # tests
+  numpy,
+  pytest-asyncio,
+  pytest-mock,
+  pytest-vcr,
+  pytestCheckHook,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "fsspec";
-  version = "2024.12.0";
+  version = "2025.2.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "fsspec";
     repo = "filesystem_spec";
     tag = version;
-    hash = "sha256-Vc0vBayPg6zZ4+pxJsHChSGg0kjA0Q16+Gk0bO0IEpI=";
+    hash = "sha256-vJYnPbGbEMAe1p0EUBxSRZYtvBdJzjzDOesyTJsFJbU=";
   };
 
   build-system = [
@@ -58,9 +62,9 @@ buildPythonPackage rec {
       distributed
     ];
     dropbox = [
-      # missing dropboxdrivefs
-      requests
       dropbox
+      # dropboxdrivefs
+      requests
     ];
     entrypoints = [ ];
     full = [
@@ -90,10 +94,7 @@ buildPythonPackage rec {
     gs = [ gcsfs ];
     gui = [ panel ];
     hdfs = [ pyarrow ];
-    http = [
-      aiohttp
-      requests
-    ];
+    http = [ aiohttp ];
     libarchive = [ libarchive-c ];
     oci = [ ocifs ];
     s3 = [ s3fs ];
@@ -110,39 +111,19 @@ buildPythonPackage rec {
     pytest-mock
     pytest-vcr
     pytestCheckHook
+    writableTmpDirAsHomeHook
   ];
 
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
   __darwinAllowLocalNetworking = true;
 
-  disabledTests =
-    [
-      # Test assumes user name is part of $HOME
-      # AssertionError: assert 'nixbld' in '/homeless-shelter/foo/bar'
-      "test_strip_protocol_expanduser"
-      # test accesses this remote ftp server:
-      # https://ftp.fau.de/debian-cd/current/amd64/log/success
-      "test_find"
-      # Tests want to access S3
-      "test_urlpath_inference_errors"
-      "test_mismatch"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
-      # works locally on APFS, fails on hydra with AssertionError comparing timestamps
-      # darwin hydra builder uses HFS+ and has only one second timestamp resolution
-      # this two tests however, assume nanosecond resolution
-      "test_modified"
-      "test_touch"
-      # tries to access /home, ignores $HOME
-      "test_directories"
-    ];
-
-  disabledTestPaths = [
-    # JSON decoding issues
-    "fsspec/implementations/tests/test_dbfs.py"
+  disabledTests = lib.optionals (stdenv.hostPlatform.isDarwin) [
+    # works locally on APFS, fails on hydra with AssertionError comparing timestamps
+    # darwin hydra builder uses HFS+ and has only one second timestamp resolution
+    # this two tests however, assume nanosecond resolution
+    "test_modified"
+    "test_touch"
+    # tries to access /home, ignores $HOME
+    "test_directories"
   ];
 
   pythonImportsCheck = [ "fsspec" ];
@@ -152,6 +133,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/fsspec/filesystem_spec";
     changelog = "https://github.com/fsspec/filesystem_spec/raw/${version}/docs/source/changelog.rst";
     license = lib.licenses.bsd3;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ nickcao ];
   };
 }
diff --git a/pkgs/development/python-modules/gcsfs/default.nix b/pkgs/development/python-modules/gcsfs/default.nix
index e1cb3e8cc1641..a6d230bbe8d39 100644
--- a/pkgs/development/python-modules/gcsfs/default.nix
+++ b/pkgs/development/python-modules/gcsfs/default.nix
@@ -4,51 +4,57 @@
   fetchFromGitHub,
   pytestCheckHook,
   pythonOlder,
+  setuptools,
   google-auth,
   google-auth-oauthlib,
   google-cloud-storage,
   requests,
   decorator,
   fsspec,
-  ujson,
+  fusepy,
   aiohttp,
   crcmod,
   pytest-timeout,
-  pytest-vcr,
-  vcrpy,
+  pytest-asyncio,
 }:
 
 buildPythonPackage rec {
   pname = "gcsfs";
-  version = "2024.2.0";
-  format = "setuptools";
+  version = "2025.2.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "fsspec";
-    repo = pname;
+    repo = "gcsfs";
     tag = version;
-    hash = "sha256-6O09lP2cWLzeMTBathb3O/tVGZPEHSqujfUPWZIBUJI=";
+    hash = "sha256-1nPhttEmGI8jreMe5hwOZRALJa5QTNOw2McisV+cR54=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
     aiohttp
-    crcmod
     decorator
     fsspec
     google-auth
     google-auth-oauthlib
     google-cloud-storage
     requests
-    ujson
   ];
 
+  optional-dependencies = {
+    gcsfuse = [ fusepy ];
+    crc = [ crcmod ];
+  };
+
   nativeCheckInputs = [
-    pytest-vcr
     pytest-timeout
+    pytest-asyncio
     pytestCheckHook
-    vcrpy
   ];
 
   disabledTests = [
@@ -65,15 +71,13 @@ buildPythonPackage rec {
     "gcsfs/tests/test_inventory_report_listing.py"
   ];
 
-  pytestFlagsArray = [ "-x" ];
-
   pythonImportsCheck = [ "gcsfs" ];
 
-  meta = with lib; {
+  meta = {
     description = "Convenient Filesystem interface over GCS";
     homepage = "https://github.com/fsspec/gcsfs";
     changelog = "https://github.com/fsspec/gcsfs/raw/${version}/docs/source/changelog.rst";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ nbren12 ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ nbren12 ];
   };
 }
diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix
index 970791484b51a..d824661a8bcdf 100644
--- a/pkgs/development/python-modules/moto/default.nix
+++ b/pkgs/development/python-modules/moto/default.nix
@@ -9,15 +9,15 @@
   crc32c,
   cryptography,
   docker,
-  fetchPypi,
+  fetchFromGitHub,
   flask-cors,
   flask,
   freezegun,
   graphql-core,
   jinja2,
   joserfc,
-  jsondiff,
   jsonpath-ng,
+  jsonschema,
   multipart,
   openapi-spec-validator,
   py-partiql-parser,
@@ -37,17 +37,21 @@
 
 buildPythonPackage rec {
   pname = "moto";
-  version = "5.0.26";
+  version = "5.0.28";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-aCn1imcKCH58W2P4GDxrctZKFETkIMISJQtzJraakYM=";
+  src = fetchFromGitHub {
+    owner = "getmoto";
+    repo = "moto";
+    tag = version;
+    hash = "sha256-++kkPiI3AOTF+VlvPWhjhuiIjiHQPa3M0Nmh3+1PHSE=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [
+    setuptools
+  ];
 
   dependencies = [
     boto3
@@ -64,56 +68,54 @@ buildPythonPackage rec {
   optional-dependencies = {
     all = [
       antlr4-python3-runtime
-      aws-xray-sdk
-      cfn-lint
-      docker
-      flask
-      flask-cors
-      graphql-core
       joserfc
-      jsondiff
       jsonpath-ng
-      multipart
+      docker
+      graphql-core
+      pyyaml
+      cfn-lint
+      jsonschema
       openapi-spec-validator
-      py-partiql-parser
       pyparsing
-      pyyaml
+      py-partiql-parser
+      aws-xray-sdk
       setuptools
+      multipart
     ];
     proxy = [
       antlr4-python3-runtime
-      aws-xray-sdk
-      cfn-lint
-      docker
-      graphql-core
       joserfc
-      jsondiff
       jsonpath-ng
-      multipart
+      docker
+      graphql-core
+      pyyaml
+      cfn-lint
       openapi-spec-validator
-      py-partiql-parser
       pyparsing
-      pyyaml
+      py-partiql-parser
+      aws-xray-sdk
       setuptools
+      multipart
     ];
     server = [
       antlr4-python3-runtime
-      aws-xray-sdk
-      cfn-lint
-      docker
-      flask
-      flask-cors
-      graphql-core
       joserfc
-      jsondiff
       jsonpath-ng
+      docker
+      graphql-core
+      pyyaml
+      cfn-lint
       openapi-spec-validator
-      py-partiql-parser
       pyparsing
-      pyyaml
+      py-partiql-parser
+      aws-xray-sdk
       setuptools
+      flask
+      flask-cors
     ];
-    cognitoidp = [ joserfc ];
+    acm = [ ];
+    acmpca = [ ];
+    amp = [ ];
     apigateway = [
       pyyaml
       joserfc
@@ -123,19 +125,53 @@ buildPythonPackage rec {
       pyyaml
       openapi-spec-validator
     ];
+    applicationautoscaling = [ ];
+    appsync = [
+      graphql-core
+    ];
+    athena = [ ];
+    autoscaling = [ ];
+    awslambda = [
+      docker
+    ];
+    awslambda_simple = [ ];
+    backup = [ ];
+    batch = [
+      docker
+    ];
+    batch_simple = [ ];
+    budgets = [ ];
+    ce = [ ];
     cloudformation = [
-      aws-xray-sdk
-      cfn-lint
+      joserfc
       docker
       graphql-core
-      joserfc
-      jsondiff
+      pyyaml
+      cfn-lint
       openapi-spec-validator
-      py-partiql-parser
       pyparsing
-      pyyaml
+      py-partiql-parser
+      aws-xray-sdk
       setuptools
     ];
+    cloudfront = [ ];
+    cloudtrail = [ ];
+    cloudwatch = [ ];
+    codebuild = [ ];
+    codecommit = [ ];
+    codepipeline = [ ];
+    cognitoidentity = [ ];
+    cognitoidp = [
+      joserfc
+    ];
+    comprehend = [ ];
+    config = [ ];
+    databrew = [ ];
+    datapipeline = [ ];
+    datasync = [ ];
+    dax = [ ];
+    dms = [ ];
+    ds = [ ];
     dynamodb = [
       docker
       py-partiql-parser
@@ -144,33 +180,116 @@ buildPythonPackage rec {
       docker
       py-partiql-parser
     ];
-    events = [ jsonpath-ng ];
-    glue = [ pyparsing ];
-    iotdata = [ jsondiff ];
+    ebs = [ ];
+    ec2 = [ ];
+    ec2instanceconnect = [ ];
+    ecr = [ ];
+    ecs = [ ];
+    efs = [ ];
+    eks = [ ];
+    elasticache = [ ];
+    elasticbeanstalk = [ ];
+    elastictranscoder = [ ];
+    elb = [ ];
+    elbv2 = [ ];
+    emr = [ ];
+    emrcontainers = [ ];
+    emrserverless = [ ];
+    es = [ ];
+    events = [
+      jsonpath-ng
+    ];
+    firehose = [ ];
+    forecast = [ ];
+    glacier = [ ];
+    glue = [
+      pyparsing
+    ];
+    greengrass = [ ];
+    guardduty = [ ];
+    iam = [ ];
+    inspector2 = [ ];
+    iot = [ ];
+    iotdata = [ ];
+    ivs = [ ];
+    kinesis = [ ];
+    kinesisvideo = [ ];
+    kinesisvideoarchivedmedia = [ ];
+    kms = [ ];
+    logs = [ ];
+    managedblockchain = [ ];
+    mediaconnect = [ ];
+    medialive = [ ];
+    mediapackage = [ ];
+    mediastore = [ ];
+    mediastoredata = [ ];
+    meteringmarketplace = [ ];
+    mq = [ ];
+    opsworks = [ ];
+    organizations = [ ];
+    panorama = [ ];
+    personalize = [ ];
+    pinpoint = [ ];
+    polly = [ ];
+    quicksight = [
+      jsonschema
+    ];
+    ram = [ ];
+    rds = [ ];
+    redshift = [ ];
+    redshiftdata = [ ];
+    rekognition = [ ];
+    resourcegroups = [ ];
     resourcegroupstaggingapi = [
-      cfn-lint
+      joserfc
       docker
       graphql-core
-      joserfc
-      jsondiff
+      pyyaml
+      cfn-lint
       openapi-spec-validator
-      py-partiql-parser
       pyparsing
-      pyyaml
+      py-partiql-parser
     ];
+    route53 = [ ];
+    route53resolver = [ ];
     s3 = [
       pyyaml
       py-partiql-parser
     ];
+    s3crc32c = [
+      pyyaml
+      py-partiql-parser
+      crc32c
+    ];
+    s3control = [ ];
+    sagemaker = [ ];
+    sdb = [ ];
+    scheduler = [ ];
+    secretsmanager = [ ];
+    servicediscovery = [ ];
+    servicequotas = [ ];
+    ses = [ ];
+    signer = [ ];
     sns = [ ];
+    sqs = [ ];
+    ssm = [
+      pyyaml
+    ];
+    ssoadmin = [ ];
     stepfunctions = [
       antlr4-python3-runtime
       jsonpath-ng
     ];
-    s3crc32c = [
-      pyyaml
-      py-partiql-parser
-      crc32c
+    sts = [ ];
+    support = [ ];
+    swf = [ ];
+    textract = [ ];
+    timestreamwrite = [ ];
+    transcribe = [ ];
+    wafv2 = [ ];
+    xray = [
+      aws-xray-sdk
+      setuptools
     ];
   };
 
@@ -181,7 +300,7 @@ buildPythonPackage rec {
     pytest-order
     pytest-xdist
     pytestCheckHook
-  ] ++ optional-dependencies.all;
+  ] ++ optional-dependencies.server;
 
   # Some tests depend on AWS credentials environment variables to be set.
   env.AWS_ACCESS_KEY_ID = "ak";
diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix
index af5ae376c84fe..71832865e313f 100644
--- a/pkgs/development/python-modules/s3fs/default.nix
+++ b/pkgs/development/python-modules/s3fs/default.nix
@@ -3,9 +3,6 @@
   buildPythonPackage,
   fetchFromGitHub,
 
-  # buildInputs
-  docutils,
-
   # build-system
   setuptools,
 
@@ -33,20 +30,21 @@ buildPythonPackage rec {
     hash = "sha256-nnfvccORDspj54sRxL3d0hn4MpzKYGKE2Kl0v/wLaNw=";
   };
 
-  buildInputs = [ docutils ];
-
-  build-system = [ setuptools ];
-
-  pythonRelaxDeps = [
-    "fsspec"
+  build-system = [
+    setuptools
   ];
 
   dependencies = [
     aiobotocore
-    aiohttp
     fsspec
+    aiohttp
   ];
 
+  optional-dependencies = {
+    awscli = aiobotocore.optional-dependencies.awscli;
+    boto3 = aiobotocore.optional-dependencies.boto3;
+  };
+
   pythonImportsCheck = [ "s3fs" ];
 
   nativeCheckInputs = [
@@ -59,80 +57,6 @@ buildPythonPackage rec {
   disabledTests = [
     # require network access
     "test_async_close"
-
-    # AssertionError: assert ['x', 'y'] == []
-    "test_with_data"
-
-    # AssertionError: assert ['1', 'x', 'y'] == []
-    "test_clear_empty"
-    "test_no_dircache"
-
-    # KeyError: 'ChecksumAlgorithm'
-    "test_info"
-
-    # KeyError:
-    # del d[1]
-    "test_complex_keys"
-
-    # TypeError: string indices must be integers, not 'str'
-    "test_bucket_versioning"
-    "test_bulk_delete"
-    "test_copy_with_source_and_destination_as_list"
-    "test_cp_directory_recursive"
-    "test_dynamic_add_rm"
-    "test_get_directory_to_existing_directory"
-    "test_get_directory_to_new_directory"
-    "test_get_directory_without_files_with_same_name_prefix"
-    "test_get_file_info_with_selector"
-    "test_get_file_to_existing_directory"
-    "test_get_file_to_file_in_existing_directory"
-    "test_get_file_to_file_in_new_directory"
-    "test_get_file_to_new_directory"
-    "test_get_glob_edge_cases"
-    "test_get_glob_to_existing_directory"
-    "test_get_glob_to_new_directory"
-    "test_get_list_of_files_to_existing_directory"
-    "test_get_list_of_files_to_new_directory"
-    "test_get_with_source_and_destination_as_list"
-    "test_move[False]"
-    "test_move[True]"
-    "test_new_bucket"
-    "test_new_bucket_auto"
-    "test_pipe_exclusive"
-    "test_put_directory_recursive"
-    "test_put_directory_to_existing_directory"
-    "test_put_directory_to_new_directory"
-    "test_put_directory_without_files_with_same_name_prefix"
-    "test_put_file_to_existing_directory"
-    "test_put_file_to_file_in_existing_directory"
-    "test_put_file_to_file_in_new_directory"
-    "test_put_file_to_new_directory"
-    "test_put_glob_edge_cases"
-    "test_put_glob_to_existing_directory"
-    "test_put_glob_to_new_directory"
-    "test_put_list_of_files_to_existing_directory"
-    "test_put_list_of_files_to_new_directory"
-    "test_rm"
-    "test_rm_invalidates_cache"
-    "test_rm_recursive_folder"
-    "test_s3_big_ls"
-    "test_s3fs_etag_preserving_multipart_copy"
-    "test_tags"
-
-    # ExceptionGroup: errors while tearing down <Function test_copy_two_files_new_directory> (2 sub-exceptions)
-    "test_copy_directory_to_existing_directory"
-    "test_copy_directory_to_new_directory"
-    "test_copy_directory_without_files_with_same_name_prefix"
-    "test_copy_file_to_existing_directory"
-    "test_copy_file_to_file_in_existing_directory"
-    "test_copy_file_to_file_in_new_directory"
-    "test_copy_file_to_new_directory"
-    "test_copy_glob_edge_cases"
-    "test_copy_glob_to_existing_directory"
-    "test_copy_glob_to_new_directory"
-    "test_copy_list_of_files_to_existing_directory"
-    "test_copy_list_of_files_to_new_directory"
-    "test_copy_two_files_new_directory"
   ];
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix
index 97aac3a17bfea..dcf80fc53d4e4 100644
--- a/pkgs/development/python-modules/s3transfer/default.nix
+++ b/pkgs/development/python-modules/s3transfer/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "s3transfer";
-  version = "0.10.1";
+  version = "0.11.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,14 +20,20 @@ buildPythonPackage rec {
     owner = "boto";
     repo = "s3transfer";
     tag = version;
-    hash = "sha256-EHNkYviafnuU8AADp9oyaDuAnoPOdOVNSLCcoONnHPY=";
+    hash = "sha256-59uyCgormgRX1JnOUtZv6wRXQiy5CvM/2sSzSC3h1Rc=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [
+    setuptools
+  ];
 
-  propagatedBuildInputs = [ botocore ];
+  dependencies = [
+    botocore
+  ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
 
   disabledTestPaths =
     [
@@ -43,14 +49,14 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "s3transfer" ];
 
   optional-dependencies = {
-    crt = [ botocore.optional-dependencies.crt ];
+    crt = botocore.optional-dependencies.crt;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Library for managing Amazon S3 transfers";
     homepage = "https://github.com/boto/s3transfer";
     changelog = "https://github.com/boto/s3transfer/blob/${version}/CHANGELOG.rst";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ nickcao ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ nickcao ];
   };
 }