From f3095ca9140a5405b35340848cce42f47a21406f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 8 Jul 2026 19:35:08 -0700 Subject: [PATCH 1/5] python3Packages.vdirsyncer: update dependencies --- .../python-modules/vdirsyncer/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index 2b31b2e4b0f7..21759bfb6a85 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -5,17 +5,12 @@ fetchpatch, click, click-log, - click-threading, - requests-toolbelt, requests, - atomicwrites, hypothesis, pytestCheckHook, pytest-cov-stub, - pytest-subtesthack, setuptools, setuptools-scm, - wheel, aiostream, aiohttp-oauthlib, aiohttp, @@ -42,22 +37,21 @@ buildPythonPackage rec { ]; dependencies = [ - atomicwrites click click-log - click-threading requests - requests-toolbelt aiostream aiohttp - aiohttp-oauthlib ]; + optional-dependencies = { + google = [ aiohttp-oauthlib ]; + }; + nativeCheckInputs = [ hypothesis pytestCheckHook pytest-cov-stub - pytest-subtesthack pytest-asyncio trustme aioresponses From 9ab30a27e62e3f878fb0ced266ae85c21122df33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 8 Jul 2026 19:39:35 -0700 Subject: [PATCH 2/5] vdirsyncer: include optional dependencies --- pkgs/by-name/vd/vdirsyncer/package.nix | 10 ++++++++++ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/vd/vdirsyncer/package.nix diff --git a/pkgs/by-name/vd/vdirsyncer/package.nix b/pkgs/by-name/vd/vdirsyncer/package.nix new file mode 100644 index 000000000000..80f9ef67ce0a --- /dev/null +++ b/pkgs/by-name/vd/vdirsyncer/package.nix @@ -0,0 +1,10 @@ +{ + lib, + python3Packages, +}: + +python3Packages.toPythonApplication ( + python3Packages.vdirsyncer.overridePythonAttrs (old: { + dependencies = old.dependencies ++ lib.concatAttrValues old.optional-dependencies; + }) +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4cbba225ac2..6a0af65066fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9577,8 +9577,6 @@ with pkgs; uuagc = haskell.lib.compose.justStaticExecutables haskellPackages.uuagc; - vdirsyncer = with python3Packages; toPythonApplication vdirsyncer; - vim = vimUtils.makeCustomizable ( callPackage ../applications/editors/vim { } From 953d6b745f4e26d9e08034d8ba099e3e72542831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 8 Jul 2026 19:41:11 -0700 Subject: [PATCH 3/5] python3Packages.vdirsyncer: use versionCheckHook --- pkgs/development/python-modules/vdirsyncer/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index 21759bfb6a85..c7aeb7d4f1ef 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -17,8 +17,7 @@ pytest-asyncio, trustme, aioresponses, - vdirsyncer, - testers, + versionCheckHook, }: buildPythonPackage rec { @@ -67,7 +66,9 @@ buildPythonPackage rec { "test_verbosity" ]; - passthru.tests.version = testers.testVersion { package = vdirsyncer; }; + nativeInstallCheckInputs = [ + versionCheckHook + ]; meta = { description = "Synchronize calendars and contacts"; From 6e3ffc411982b934ca10a637f7682d9d570db1ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 8 Jul 2026 19:43:25 -0700 Subject: [PATCH 4/5] python3Packages.vdirsyncer: add NixOS test to passthru.tests --- pkgs/development/python-modules/vdirsyncer/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index c7aeb7d4f1ef..39fc9d66bb54 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -17,6 +17,7 @@ pytest-asyncio, trustme, aioresponses, + nixosTests, versionCheckHook, }: @@ -70,6 +71,10 @@ buildPythonPackage rec { versionCheckHook ]; + passthru.tests = { + inherit (nixosTests) vdirsyncer; + }; + meta = { description = "Synchronize calendars and contacts"; homepage = "https://github.com/pimutils/vdirsyncer"; From fdd954251f4ff5232dadd7e11fe92c1e804cb20c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 8 Jul 2026 19:46:41 -0700 Subject: [PATCH 5/5] python3Packages.vdirsyncer: use finalAttrs --- pkgs/development/python-modules/vdirsyncer/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index 39fc9d66bb54..92a51a2f0678 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -21,13 +21,13 @@ versionCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "vdirsyncer"; version = "0.20.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-/rGlM1AKlcFP0VVzOhBW/jWRklU9gsB8a6BPy/xAsS0="; }; @@ -78,9 +78,9 @@ buildPythonPackage rec { meta = { description = "Synchronize calendars and contacts"; homepage = "https://github.com/pimutils/vdirsyncer"; - changelog = "https://github.com/pimutils/vdirsyncer/blob/v${version}/CHANGELOG.rst"; + changelog = "https://github.com/pimutils/vdirsyncer/blob/v${finalAttrs.version}/CHANGELOG.rst"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ stephen-huan ]; mainProgram = "vdirsyncer"; }; -} +})