From b596562eab846ca0f6a19a76aeb4463bd21fcb57 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 25 Jan 2026 22:37:08 +0100 Subject: [PATCH 1/3] aws-encryption-sdk-cli: 4.2.0 -> 4.3.0 Diff: https://github.com/aws/aws-encryption-sdk-cli/compare/v4.2.0...v4.3.0 --- .../aw/aws-encryption-sdk-cli/package.nix | 36 +++++-------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix b/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix index b5a07237c8b9..81120245a6dd 100644 --- a/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix +++ b/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix @@ -3,46 +3,28 @@ aws-encryption-sdk-cli, fetchPypi, nix-update-script, - python3, + python3Packages, testers, }: -let - localPython = python3.override { - self = localPython; - packageOverrides = final: prev: { - 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="; - }; - }); - }; - }; -in - -localPython.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "aws-encryption-sdk-cli"; - version = "4.2.0"; + version = "4.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-gORrscY+Bgmz2FrKdSBd56jP0yuEklytMeA3wr8tTZU="; + inherit version; + pname = "aws_encryption_sdk_cli"; + hash = "sha256-FfLgR7gocZ0cLV7bxqvKNI+Fs7kQF0XhR3zf6tHXwOE="; }; pythonRelaxDeps = [ "aws-encryption-sdk" ]; - build-system = with localPython.pkgs; [ + build-system = with python3Packages; [ setuptools ]; - dependencies = with localPython.pkgs; [ + dependencies = with python3Packages; [ attrs aws-encryption-sdk base64io @@ -52,7 +34,7 @@ localPython.pkgs.buildPythonApplication rec { doCheck = true; - nativeCheckInputs = with localPython.pkgs; [ + nativeCheckInputs = with python3Packages; [ mock pytest-mock pytest7CheckHook From 346e0d2a522d2335d2ad5b3d83be0a32e6e23381 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 25 Jan 2026 22:10:59 +0100 Subject: [PATCH 2/3] python3Packages.s3fs: 2025.12.0 -> 2026.1.0 Diff: https://github.com/fsspec/s3fs/compare/2025.12.0...2026.1.0 Changelog: https://github.com/fsspec/s3fs/blob/2026.1.0/docs/source/changelog.rst --- pkgs/development/python-modules/s3fs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 3cf9a73b8458..7669ea249b5e 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2025.12.0"; + version = "2026.1.0"; pyproject = true; src = fetchFromGitHub { owner = "fsspec"; repo = "s3fs"; tag = version; - hash = "sha256-/r+2eXOXUcMQ7TxyrEofZ79S8n8sA3++pJxdH3eQrYw="; + hash = "sha256-wkcDViE2Vr1fFMMFz3o7ewlI5UvVnWV7jIa9Es8d9Do="; }; build-system = [ From d0fabe01fa410a5504b7705ed639c9c6f1a0f940 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 25 Jan 2026 22:12:07 +0100 Subject: [PATCH 3/3] python3Packages.aioboto3: 15.1.0 -> 15.5.0 Diff: https://github.com/terricain/aioboto3/compare/v15.1.0...v15.5.0 Changelog: https://github.com/terricain/aioboto3/blob/refs/tags/v15.5.0/CHANGELOG.rst --- .../python-modules/aioboto3/boto3-compat.patch | 15 --------------- .../python-modules/aioboto3/default.nix | 7 ++----- 2 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 pkgs/development/python-modules/aioboto3/boto3-compat.patch diff --git a/pkgs/development/python-modules/aioboto3/boto3-compat.patch b/pkgs/development/python-modules/aioboto3/boto3-compat.patch deleted file mode 100644 index 7f4b2272e509..000000000000 --- a/pkgs/development/python-modules/aioboto3/boto3-compat.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/aioboto3/session.py b/aioboto3/session.py -index b6c2129..c97eaaf 100644 ---- a/aioboto3/session.py -+++ b/aioboto3/session.py -@@ -79,7 +79,9 @@ class Session(boto3.session.Session): - - if any(creds): - if self._account_id_set_without_credentials( -- aws_account_id, aws_access_key_id, aws_secret_access_key -+ aws_account_id=aws_account_id, -+ aws_access_key_id=aws_access_key_id, -+ aws_secret_access_key=aws_secret_access_key - ): - raise NoCredentialsError() - diff --git a/pkgs/development/python-modules/aioboto3/default.nix b/pkgs/development/python-modules/aioboto3/default.nix index 6632580490ed..8f3a56165f65 100644 --- a/pkgs/development/python-modules/aioboto3/default.nix +++ b/pkgs/development/python-modules/aioboto3/default.nix @@ -16,19 +16,16 @@ buildPythonPackage rec { pname = "aioboto3"; - version = "15.1.0"; + version = "15.5.0"; pyproject = true; src = fetchFromGitHub { owner = "terricain"; repo = "aioboto3"; tag = "v${version}"; - hash = "sha256-H/hAfFyBfeBoR6nW0sv3/AzFPATUl2uJ+JbzNB5xemo="; + hash = "sha256-yGKjcZlXs1f72OGX5rUWvfDKZAYU3ZV2RVQnd0InxBQ="; }; - # https://github.com/terricain/aioboto3/pull/377 - patches = [ ./boto3-compat.patch ]; - pythonRelaxDeps = [ "aiobotocore" ];