From 3f475ce93bfb7ae5e2f867a81872d2fd803f4210 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Jul 2024 02:35:27 +0000 Subject: [PATCH 1/2] python312Packages.requests-aws4auth: 1.2.3 -> 1.3.1 --- pkgs/development/python-modules/requests-aws4auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix index 670c50c51a2a..87f213933c4e 100644 --- a/pkgs/development/python-modules/requests-aws4auth/default.nix +++ b/pkgs/development/python-modules/requests-aws4auth/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "requests-aws4auth"; - version = "1.2.3"; + version = "1.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tedder"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9ySuX7eKrSwgxgFoMdnVTsIfpnm9kVcI9AqSb+AsVaU="; + hash = "sha256-tRo38fdWqZmutGhWv8Hks+oFaLv770RlAHYgS3S6xJA="; }; propagatedBuildInputs = [ From f3e0801d9d3980ed542c542e3597b2f5ef92935b Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 28 Jul 2024 12:43:50 +0900 Subject: [PATCH 2/2] python312Packages.requests-aws4auth: refactor --- .../requests-aws4auth/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix index 87f213933c4e..8e5218dc7dbd 100644 --- a/pkgs/development/python-modules/requests-aws4auth/default.nix +++ b/pkgs/development/python-modules/requests-aws4auth/default.nix @@ -4,36 +4,34 @@ fetchFromGitHub, httpx, pytestCheckHook, - python, pythonOlder, requests, - six, + setuptools, }: buildPythonPackage rec { pname = "requests-aws4auth"; version = "1.3.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tedder"; - repo = pname; + repo = "requests-aws4auth"; rev = "refs/tags/v${version}"; hash = "sha256-tRo38fdWqZmutGhWv8Hks+oFaLv770RlAHYgS3S6xJA="; }; - propagatedBuildInputs = [ - requests - six - ]; + build-system = [ setuptools ]; - passthru.optional-dependencies = { + dependencies = [ requests ]; + + optional-dependencies = { httpx = [ httpx ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.httpx; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.httpx; pythonImportsCheck = [ "requests_aws4auth" ];