From 5b260ab83d67b08d561f3191971efa57f6df87c0 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 20:26:32 +0900 Subject: [PATCH 1/2] python312Packages.vobject: 0.9.7 -> 0.9.8 Diff: https://github.com/py-vobject/vobject/compare/v0.9.7...v0.9.8 --- pkgs/development/python-modules/vobject/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vobject/default.nix b/pkgs/development/python-modules/vobject/default.nix index db8692e77b06..ad3bc832a428 100644 --- a/pkgs/development/python-modules/vobject/default.nix +++ b/pkgs/development/python-modules/vobject/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "0.9.7"; + version = "0.9.8"; format = "setuptools"; pname = "vobject"; src = fetchPypi { inherit pname version; - hash = "sha256-q3J7+B3oiYStpcEfBm8eFkmQPT49fskfHOloFyr9UlY="; + hash = "sha256-2wCn9NtJOXFV3YpoceiioBdabrpaZUww6RD4KylRS1g="; }; disabled = isPyPy; From 21d6e5c776852852fda897b0b33a4b137fed2f20 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 3 Nov 2024 00:03:26 +0900 Subject: [PATCH 2/2] python312Packages.vobject: refactor --- .../python-modules/vobject/default.nix | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/vobject/default.nix b/pkgs/development/python-modules/vobject/default.nix index ad3bc832a428..44a769b306b3 100644 --- a/pkgs/development/python-modules/vobject/default.nix +++ b/pkgs/development/python-modules/vobject/default.nix @@ -3,14 +3,17 @@ buildPythonPackage, fetchPypi, isPyPy, - python, + setuptools, python-dateutil, + pytz, + six, + pytestCheckHook, }: buildPythonPackage rec { version = "0.9.8"; - format = "setuptools"; pname = "vobject"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -19,13 +22,23 @@ buildPythonPackage rec { disabled = isPyPy; - propagatedBuildInputs = [ python-dateutil ]; + build-system = [ setuptools ]; - checkPhase = "${python.interpreter} tests.py"; + dependencies = [ + python-dateutil + pytz + six + ]; + + pythonImportsCheck = [ "vobject" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "tests.py" ]; meta = with lib; { description = "Module for reading vCard and vCalendar files"; - homepage = "http://eventable.github.io/vobject/"; + homepage = "https://github.com/py-vobject/vobject"; license = licenses.asl20; maintainers = [ ]; };