diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
| commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
| tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/calcurse.scm | |
| parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
| parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in:
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/machine-learning.scm
gnu/packages/networking.scm
gnu/packages/polkit.scm
gnu/packages/pulseaudio.scm
gnu/packages/rpc.scm
gnu/packages/rust.scm
gnu/packages/version-control.scm
gnu/packages/w3m.scm
Diffstat (limited to 'gnu/packages/calcurse.scm')
| -rw-r--r-- | gnu/packages/calcurse.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/calcurse.scm b/gnu/packages/calcurse.scm index d807c15d68..5da701492b 100644 --- a/gnu/packages/calcurse.scm +++ b/gnu/packages/calcurse.scm @@ -39,8 +39,8 @@ (sha256 (base32 "0cgkd285x5pk62lmdx9fjxl46c5lj8wj2cqbxq7d99yb4il5fdjk")))) (build-system gnu-build-system) - (inputs `(("ncurses" ,ncurses))) - (native-inputs `(("tzdata" ,tzdata-for-tests))) + (inputs (list ncurses)) + (native-inputs (list tzdata-for-tests)) (arguments ;; The ical tests all want to create a ".calcurse" directory, and may ;; fail with "cannot create directory '.calcurse': File exists" if run @@ -64,8 +64,8 @@ (add-before 'check 'check-setup (lambda* (#:key inputs #:allow-other-keys) (setenv "TZDIR" ; for test/ical-007.sh - (string-append (assoc-ref inputs "tzdata") - "/share/zoneinfo"))))))) + (search-input-directory inputs + "share/zoneinfo"))))))) (home-page "https://www.calcurse.org") (synopsis "Text-based calendar and scheduling") (description |