Update AWS packages (#483789)
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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"
|
||||
];
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
Reference in New Issue
Block a user