From 450862a520ec14f04032ad15a89583a5867e9eff Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 23 Mar 2026 15:53:44 +0200
Subject: [PATCH 1/4] khard: update meta.homepage

---
 pkgs/by-name/kh/khard/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/kh/khard/package.nix b/pkgs/by-name/kh/khard/package.nix
index 92bd75575a0d..819235254b43 100644
--- a/pkgs/by-name/kh/khard/package.nix
+++ b/pkgs/by-name/kh/khard/package.nix
@@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   '';
 
   preCheck = ''
-    # see https://github.com/scheibler/khard/issues/263
+    # see https://github.com/lucc/khard/issues/263
     export COLUMNS=80
   '';
 
@@ -48,7 +48,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   passthru.tests.version = testers.testVersion { package = khard; };
 
   meta = {
-    homepage = "https://github.com/scheibler/khard";
+    homepage = "https://github.com/lucc/khard";
     description = "Console carddav client";
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ matthiasbeyer ];

From 2f1bc25624d5aa15f6e2f337f3246d675c6a5289 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 23 Mar 2026 16:00:14 +0200
Subject: [PATCH 2/4] khard: use versionCheckHook instead of passthru.tests

---
 pkgs/by-name/kh/khard/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/kh/khard/package.nix b/pkgs/by-name/kh/khard/package.nix
index 819235254b43..3f77ac2e0b54 100644
--- a/pkgs/by-name/kh/khard/package.nix
+++ b/pkgs/by-name/kh/khard/package.nix
@@ -2,8 +2,7 @@
   lib,
   python3,
   fetchPypi,
-  khard,
-  testers,
+  versionCheckHook,
 }:
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
@@ -45,7 +44,9 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
 
   pythonImportsCheck = [ "khard" ];
 
-  passthru.tests.version = testers.testVersion { package = khard; };
+  nativeCheckInputs = [
+    versionCheckHook
+  ];
 
   meta = {
     homepage = "https://github.com/lucc/khard";

From 10f40087d1b01c24982da3af6c7fbbf9539cc3e8 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 23 Mar 2026 16:01:10 +0200
Subject: [PATCH 3/4] khard: add doronbehar to maintainers

---
 pkgs/by-name/kh/khard/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/kh/khard/package.nix b/pkgs/by-name/kh/khard/package.nix
index 3f77ac2e0b54..029d689f8528 100644
--- a/pkgs/by-name/kh/khard/package.nix
+++ b/pkgs/by-name/kh/khard/package.nix
@@ -52,7 +52,10 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     homepage = "https://github.com/lucc/khard";
     description = "Console carddav client";
     license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ matthiasbeyer ];
+    maintainers = with lib.maintainers; [
+      matthiasbeyer
+      doronbehar
+    ];
     mainProgram = "khard";
   };
 })

From b851c0d7f0d76d0d88b9ae492d9d5815db84677d Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 23 Mar 2026 16:03:33 +0200
Subject: [PATCH 4/4] khard: disable man page generation due to upstream issue
 with sphinx 9

See: https://github.com/lucc/khard/issues/352
---
 pkgs/by-name/kh/khard/package.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/by-name/kh/khard/package.nix b/pkgs/by-name/kh/khard/package.nix
index 029d689f8528..dff54ca96191 100644
--- a/pkgs/by-name/kh/khard/package.nix
+++ b/pkgs/by-name/kh/khard/package.nix
@@ -18,14 +18,8 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   build-system = with python3.pkgs; [
     setuptools
     setuptools-scm
-    sphinxHook
-    sphinx-argparse
-    sphinx-autoapi
-    sphinx-autodoc-typehints
   ];
 
-  sphinxBuilders = [ "man" ];
-
   dependencies = with python3.pkgs; [
     configobj
     ruamel-yaml