From 8a4f00414d494130fbf37022225bb451008f9a0b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 1 Oct 2024 09:12:14 +0200 Subject: [PATCH 1/3] python312Packages.botocore: 1.35.29 -> 1.35.30 Changelog: https://github.com/boto/botocore/blob/1.35.30/CHANGELOG.rst --- .../python-modules/botocore/default.nix | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 974846ebd287..34e6e1a7edc2 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -3,34 +3,35 @@ awscrt, buildPythonPackage, fetchPypi, + + # build-system + setuptools, + + # dependencies jmespath, + python-dateutil, + urllib3, + + # tests jsonschema, pytestCheckHook, - python-dateutil, - pythonOlder, - setuptools, - urllib3, }: buildPythonPackage rec { pname = "botocore"; - version = "1.35.29"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.35.30"; # N.B: if you change this, change boto3 and awscli to a matching version pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchPypi { inherit pname version; - hash = "sha256-TtKKsDZ1uwCKKQxFLF3deqpdTj+hkSqtvfkwV+6ENis="; + hash = "sha256-q1NQ6KUOSNNx+i1RfWXCmkDEN4jLmhU4f5PqxaI98P0="; }; - pythonRelaxDeps = [ "urllib3" ]; - - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ jmespath python-dateutil urllib3 @@ -55,11 +56,11 @@ buildPythonPackage rec { crt = [ awscrt ]; }; - meta = with lib; { + meta = { description = "Low-level interface to a growing number of Amazon Web Services"; homepage = "https://github.com/boto/botocore"; changelog = "https://github.com/boto/botocore/blob/${version}/CHANGELOG.rst"; - license = licenses.asl20; - maintainers = with maintainers; [ anthonyroussel ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ anthonyroussel ]; }; } From acecfb937c6150fd392898ec723e77f76ee9e85c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 1 Oct 2024 09:16:55 +0200 Subject: [PATCH 2/3] python312Packages.boto3: 1.35.29 -> 1.35.30 Changelog: https://github.com/boto/botocore/blob/1.35.30/CHANGELOG.rst --- .../python-modules/boto3/default.nix | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 98d8dc30c64f..08c3871a91ea 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -1,14 +1,19 @@ { lib, - botocore, buildPythonPackage, fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + botocore, jmespath, + s3transfer, + + # tests pytest-xdist, pytestCheckHook, - pythonOlder, - s3transfer, - setuptools, }: buildPythonPackage rec { @@ -16,22 +21,20 @@ buildPythonPackage rec { inherit (botocore) version; # N.B: botocore, boto3, awscli needs to be updated in lockstep, bump botocore version for updating these. pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "boto"; repo = "boto3"; rev = "refs/tags/${version}"; - hash = "sha256-4WP5E8LuuxWZi8DK8yOpvyy6isSfB4eFcbctkTEd3As="; + hash = "sha256-b08tC8EA6iW0O/7rseD9pTkKh/cJ2fe3xJZkEqxS6VI="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; pythonRelaxDeps = [ "s3transfer" ]; - propagatedBuildInputs = [ + dependencies = [ botocore jmespath s3transfer @@ -53,16 +56,16 @@ buildPythonPackage rec { crt = [ botocore.optional-dependencies.crt ]; }; - meta = with lib; { + meta = { description = "AWS SDK for Python"; homepage = "https://github.com/boto/boto3"; changelog = "https://github.com/boto/boto3/blob/${version}/CHANGELOG.rst"; - license = licenses.asl20; + license = lib.licenses.asl20; longDescription = '' Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for Python, which allows Python developers to write software that makes use of services like Amazon S3 and Amazon EC2. ''; - maintainers = with maintainers; [ anthonyroussel ]; + maintainers = with lib.maintainers; [ anthonyroussel ]; }; } From 140cfc11549639158aff91bc2edaec049fc68830 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 1 Oct 2024 09:18:32 +0200 Subject: [PATCH 3/3] awscli: 1.34.29 -> 1.34.30 Changelog: https://github.com/aws/aws-cli/blob/1.34.30/CHANGELOG.rst --- pkgs/tools/admin/awscli/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index c792563000a6..e9b5af2c1b9d 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -13,12 +13,12 @@ let 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.34.29"; + version = "1.34.30"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-2w9z6f8ThKIISEiExePHObUZzBrdltP3AfZqKh8d1Mo="; + hash = "sha256-7RdAqXdCnS7dzkGQHJHclR2KuBbSbd+epGMQDbDlYxY="; }; pythonRelaxDeps = [ @@ -32,7 +32,7 @@ let python3.pkgs.setuptools ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ botocore s3transfer colorama @@ -76,13 +76,13 @@ let }; }; - meta = with lib; { + meta = { homepage = "https://aws.amazon.com/cli/"; changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst"; description = "Unified tool to manage your AWS services"; - license = licenses.asl20; + license = lib.licenses.asl20; mainProgram = "aws"; - maintainers = with maintainers; [ anthonyroussel ]; + maintainers = with lib.maintainers; [ anthonyroussel ]; }; }; in