From 918c171f93c7dfa663315d9a502683ca48a34d4e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Sep 2024 05:23:27 +0000 Subject: [PATCH 1/2] python312Packages.python-utils: 3.8.2 -> 3.9.0 --- pkgs/development/python-modules/python-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index 6fabd9a81763..76ca4c154a62 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "python-utils"; - version = "3.8.2"; + version = "3.9.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "WoLpH"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-2scWyj0Fz39Thu0T0+UirT+he6tPYKGsvmYzzpD+/ls="; + hash = "sha256-ZmCT41VMz8BkIqF8Od5PqteyXToA4xASs0qCPD0cNc8="; }; postPatch = '' From 1351ea8708b7416681c2e7e66a0928e2b6d7c8d9 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 29 Sep 2024 12:33:13 +0900 Subject: [PATCH 2/2] python312Packages.python-utils: switch to pypa builder --- .../python-modules/python-utils/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index 76ca4c154a62..8b86add14493 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, loguru, pytest-asyncio, pytestCheckHook, @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "python-utils"; version = "3.9.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -29,16 +30,18 @@ buildPythonPackage rec { -e '/--mypy/d' ''; - propagatedBuildInputs = [ typing-extensions ]; + build-system = [ setuptools ]; - passthru.optional-dependencies = { + dependencies = [ typing-extensions ]; + + optional-dependencies = { loguru = [ loguru ]; }; nativeCheckInputs = [ pytest-asyncio pytestCheckHook - ] ++ passthru.optional-dependencies.loguru; + ] ++ optional-dependencies.loguru; pythonImportsCheck = [ "python_utils" ];