From 7335c8ce07c0a56e8e73be9d89a7b8edc9b5e831 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sat, 16 Dec 2023 04:31:08 +0100 Subject: [PATCH 1/2] python3Packages.caldav: remove outdated substituteInPlace https://github.com/python-caldav/caldav/commit/1abfac52725c5d79d5d954f4c3b8e61381604e3b https://github.com/python-caldav/caldav/commit/63603d91a092e2deac8919459f8c06ccd5f88187 This is also safe to do since it does not test xandikos or radicale by default if they are not available https://github.com/python-caldav/caldav/blob/f7e00211d6230c4c2ec84645ebce6f1140394fb7/tests/conf.py#L49 --- pkgs/development/python-modules/caldav/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix index d577264a4880..634db13ce180 100644 --- a/pkgs/development/python-modules/caldav/default.nix +++ b/pkgs/development/python-modules/caldav/default.nix @@ -45,13 +45,6 @@ buildPythonPackage rec { pytestCheckHook ]; - # xandikos and radicale are only optional test dependencies, not available for python3 - postPatch = '' - substituteInPlace setup.py \ - --replace xandikos "" \ - --replace radicale "" - ''; - pythonImportsCheck = [ "caldav" ]; meta = with lib; { From 49c6c26a62204cd960c67789070449f7219e8279 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sat, 16 Dec 2023 04:34:24 +0100 Subject: [PATCH 2/2] python3Packages.caldav: test with xandikos --- pkgs/development/python-modules/caldav/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix index 634db13ce180..97a2e3baf5b2 100644 --- a/pkgs/development/python-modules/caldav/default.nix +++ b/pkgs/development/python-modules/caldav/default.nix @@ -11,6 +11,7 @@ , setuptools , tzlocal , vobject +, xandikos }: buildPythonPackage rec { @@ -43,6 +44,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + xandikos ]; pythonImportsCheck = [ "caldav" ];