From bdf1dc9d9924fee8f1f01d50a9e9010cfe782d56 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Tue, 30 Sep 2025 11:13:34 +0300
Subject: [PATCH] gnu: khard: Update to 0.20.0.

* gnu/packages/mail.scm (khard): Update to 0.20.0.
[build-system]: Switch to pyproject-build-system.
[arguments]: Add test-flags to skip some tests.
[inputs]: Remove python-atomicwrites and python-unidecode.
[native-inputs]: Add python-pytest and python-setuptools.

Change-Id: I95a70042a8f153d7a983db49e6acd8430718fa71
---
 gnu/packages/mail.scm | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index a0d32ff2656..0417a35d7e8 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -2840,27 +2840,36 @@ maintained.")
 (define-public khard
   (package
     (name "khard")
-    (version "0.19.1")
+    (version "0.20.0")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri name version))
               (sha256
                (base32
-                "1464j728hjjpzlc89v4rbml3p4b38zp1igjd9yq3xnn3lc6hmwsr"))))
-    (build-system python-build-system)
+                "1l5xkdi0f8krvy407q4qzm2n96nyhcjjhdp7v5f0n18wy36353qp"))))
+    (build-system pyproject-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'install-completions
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (zsh (string-append out "/share/zsh/site-functions")))
-               (copy-recursively "misc/zsh" zsh)))))))
+     (list
+       #:test-flags
+       #~(list "-k"
+               (string-join
+                 (list "not test_sorting_of_korean_names"
+                       "test_sort_order_for_accentuated_names"
+                       ;; These two only fail with pytest
+                       "test_edit_source_file_without_modifications"
+                       "test_simple_edit_without_modification")
+                 " and not "))
+       #:phases
+       #~(modify-phases %standard-phases
+           (add-after 'install 'install-completions
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let* ((out (assoc-ref outputs "out"))
+                      (zsh (string-append out "/share/zsh/site-functions")))
+                 (copy-recursively "misc/zsh" zsh)))))))
     (native-inputs
-     (list python-setuptools-scm))
+     (list python-pytest python-setuptools python-setuptools-scm))
     (inputs
-     (list python-atomicwrites python-configobj python-ruamel.yaml
-           python-unidecode python-vobject))
+     (list python-configobj python-ruamel.yaml python-vobject))
     (synopsis "Console address book using CardDAV")
     (description "Khard is an address book for the console.  It creates, reads,
 modifies and removes CardDAV address book entries at your local machine.  For