diff options
author | Sharlatan Hellseher <sharlatanus@gmail.com> | 2025-06-18 22:57:23 +0100 |
---|---|---|
committer | Sharlatan Hellseher <sharlatanus@gmail.com> | 2025-06-18 23:02:48 +0100 |
commit | 656b0b1e5b1cf0fda9ad245ac32c3ed5c746802b (patch) | |
tree | 2c3ed3dc478a8d5dc595bce8affe93643d508b13 | |
parent | fd69f0334ee8cba3f03a632e014286885957f881 (diff) |
gnu: khal: Update to 0.12.0.
* gnu/packages/calendar.scm (khal): Update to 0.12.0. Apply G-expressions.
[arguments] <tests?>: Enable them.
[inputs]: Add python-aiohttp and vdirsyncer.
[native-inputs]: Remove python-setuptools-scm; add python-freezegun,
python-importlib-metadata, python-packaging, python-pytest,
python-setuptools-next, python-setuptools-scm-next, and python-wheel.
[home-page]: Move above synopsis.
[description]: Start from a new line and fix fill column indentation.
Change-Id: I0f87aef018895ee339bcd148327ca169342fe546
-rw-r--r-- | gnu/packages/calendar.scm | 69 |
1 files changed, 39 insertions, 30 deletions
diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 4e6f279bc9..42e43633ea 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -218,32 +218,40 @@ data units.") (define-public khal (package (name "khal") - (version "0.11.3") - (source (origin - (method url-fetch) - (uri (pypi-uri "khal" version)) - (sha256 - (base32 - "0pijq7crjpak1rq3hzx68fz34n7ikkcz3xsk9r3brny17z2brk58")))) - (build-system python-build-system) + ;; TODO: The latest version requires fresh pytz module and fails with + ;; error: E AttributeError: module 'icalendar' has no attribute 'use_pytz' + (version "0.12.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "khal" version)) + (sha256 + (base32 "1gxrhfr4kv5mij75nzjgj69wcssbx4dfbky196w6b4nh3v7nm2pf")))) + (build-system pyproject-build-system) (arguments - `(#:tests? #f ; The test suite is unreliable. See <https://bugs.gnu.org/44197> - #:phases (modify-phases %standard-phases - ;; Building the manpage requires khal to be installed. - (add-after 'install 'manpage - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Make installed package available for running the tests - (add-installed-pythonpath inputs outputs) - (invoke "make" "--directory=doc/" "man") - (install-file - "doc/build/man/khal.1" - (string-append (assoc-ref outputs "out") "/share/man/man1"))))))) + (list + #:phases + #~(modify-phases %standard-phases + ;; Building the manpage requires khal to be installed. + (add-after 'install 'manpage + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (invoke "make" "--directory=doc/" "man") + (install-file "doc/build/man/khal.1" + (string-append #$output "/share/man/man1"))))))) (native-inputs - (list python-setuptools-scm - ;; Required to build manpage - python-sphinxcontrib-newsfeed python-sphinx)) + (list python-freezegun + python-importlib-metadata + python-packaging + python-pytest + python-setuptools-next + python-setuptools-scm-next + python-sphinx + python-sphinxcontrib-newsfeed + python-wheel)) (inputs - (list python-atomicwrites + (list python-aiohttp + python-atomicwrites python-click python-click-log python-configobj @@ -251,16 +259,17 @@ data units.") python-icalendar python-pytz python-pyxdg + python-setproctitle python-tzlocal python-urwid - ;; For the extras. - python-setproctitle)) - (synopsis "Console calendar program") - (description "Khal is a standards based console calendar program, -able to synchronize with CalDAV servers through vdirsyncer. It includes -both a @acronym{CLI, command-line interface} and a @acronym{TUI, textual user -interface} named 'ikhal'.") + vdirsyncer)) (home-page "https://lostpackets.de/khal/") + (synopsis "Console calendar program") + (description + "Khal is a standards based console calendar program, able to synchronize +with CalDAV servers through vdirsyncer. It includes both a @acronym{CLI, +command-line interface} and a @acronym{TUI, textual user interface} named +'ikhal'.") (license license:expat))) (define-public remind |