From 5a37de54a590ce5507d8d851bc3a35015f746bd9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Apr 2024 07:29:20 +0000 Subject: [PATCH 1/2] python312Packages.s3-credentials: 0.15 -> 0.16.1 --- pkgs/development/python-modules/s3-credentials/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/s3-credentials/default.nix b/pkgs/development/python-modules/s3-credentials/default.nix index 71bc5d4f4438..706967584798 100644 --- a/pkgs/development/python-modules/s3-credentials/default.nix +++ b/pkgs/development/python-modules/s3-credentials/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "s3-credentials"; - version = "0.15"; + version = "0.16.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "simonw"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-YSsm5SMfDRqJ53XnBjMgaWWHjA6IXnmEBvxme4uiOPw="; + hash = "sha256-TuGrKSfnn0CSMpRxdCM6C446z+y9d2ZLB7+wSCxSqP4="; }; propagatedBuildInputs = [ From c1e579ce60a818b3305094c5ee5dc096091356d2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 Apr 2024 10:44:07 +0200 Subject: [PATCH 2/2] python312Packages.s3-credentials: format with nixfmt --- .../python-modules/s3-credentials/default.nix | 41 ++++++++++--------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/s3-credentials/default.nix b/pkgs/development/python-modules/s3-credentials/default.nix index 706967584798..4d7755894aa6 100644 --- a/pkgs/development/python-modules/s3-credentials/default.nix +++ b/pkgs/development/python-modules/s3-credentials/default.nix @@ -1,31 +1,35 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, click -, click-default-group -, boto3 -, pytestCheckHook -, hypothesis -, pytest-mock -, moto +{ + lib, + boto3, + buildPythonPackage, + click, + click-default-group, + fetchFromGitHub, + hypothesis, + moto, + pytest-mock, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "s3-credentials"; version = "0.16.1"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "simonw"; - repo = pname; + repo = "s3-credentials"; rev = "refs/tags/${version}"; hash = "sha256-TuGrKSfnn0CSMpRxdCM6C446z+y9d2ZLB7+wSCxSqP4="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ boto3 click click-default-group @@ -38,9 +42,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "s3_credentials" - ]; + pythonImportsCheck = [ "s3_credentials" ]; disabledTests = [ # AssertionError: assert 'directory/th...ory/... @@ -49,9 +51,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python CLI utility for creating credentials for accessing S3 buckets"; - mainProgram = "s3-credentials"; homepage = "https://github.com/simonw/s3-credentials"; + changelog = "https://github.com/simonw/s3-credentials/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ techknowlogick ]; + mainProgram = "s3-credentials"; }; }