me/guix
Archived
1
0
Fork 0
Code Activity

gnu: khal: Update to 0.10.2.

Browse source 
* gnu/packages/calendar.scm (khal): Update to 0.10.2.
[source]: Drop upstream patches.
[arguments]: Drop substitute* for bug fixed upstream and ignore failing
test in 'check.
[inputs]: Add missing inputs.

Signed-off-by: Leo Famulari <leo@famulari.name>
This commit is contained in:
Lars-Dominik Braun 2020-10-26 13:15:49 -04:00 • committed by Leo Famulari
parent 465a951c24
commit 21955a54da
No known key found for this signature in database
GPG key ID: 2646FA30BACA7F08
1 changed files with 18 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
gnu/packages/calendar.scm
View file

@ -168,23 +168,13 @@ data units.")
(define-public khal (define-public khal
(package (package
(name "khal") (name "khal")
(version "0.10.1") (version "0.10.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "khal" version)) (uri (pypi-uri "khal" version))
(sha256 (sha256
(base32 (base32
"1r8bkgjwkh7i8ygvsv51h1cnax50sb183vafg66x5snxf3dgjl6l")) "11qhrga44knlnp88py9p547d4nr5kn041d2nszwa3dqw7mf22ks9"))))
(patches
(list
(origin
(method url-fetch)
;; This patch fixes an issue with python-urwid-2.1.0
(uri "https://github.com/pimutils/khal/commit/2c5990c2de2015b251ba23617faa40ee11b8c22a.patch")
(file-name "khal-compat-urwid-2.1.0.patch")
(sha256
(base32
"11nd8hkjz68imwqqn0p54zmb53z2pfxmzchaviy7jc1ky5s9l663")))))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
@ -198,19 +188,14 @@ data units.")
"doc/build/man/khal.1" "doc/build/man/khal.1"
(string-append (assoc-ref outputs "out") "/share/man/man1")) (string-append (assoc-ref outputs "out") "/share/man/man1"))
#t)) #t))
(add-before 'check 'fix-tests
(lambda _
;; Reported upstream: <https://github.com/pimutils/khal/issues/947>.
(substitute* "tests/cli_test.py"
(("Invalid value for \"\\[ICS\\]\"") "Invalid value for \\'[ICS]\\'"))
#t))
(replace 'check (replace 'check
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs tests? #:allow-other-keys)
(if tests?
(begin
;; The tests require us to choose a timezone. ;; The tests require us to choose a timezone.
(setenv "TZ" (setenv "TZ" "UTC")
(string-append (assoc-ref inputs "tzdata") ;; The disabled test expects /dev/tty.
"/share/zoneinfo/Zulu")) (invoke "pytest" "tests" "-k" "not test_import_from_stdin"))))))))
(invoke "py.test" "tests"))))))
(native-inputs (native-inputs
`(("python-pytest" ,python-pytest) `(("python-pytest" ,python-pytest)
("python-pytest-cov" ,python-pytest-cov) ("python-pytest-cov" ,python-pytest-cov)
@ -229,6 +214,11 @@ data units.")
("python-icalendar" ,python-icalendar) ("python-icalendar" ,python-icalendar)
("python-tzlocal" ,python-tzlocal) ("python-tzlocal" ,python-tzlocal)
("python-urwid" ,python-urwid) ("python-urwid" ,python-urwid)
("python-pytz" ,python-pytz)
("python-setproctitle" ,python-setproctitle)
("python-atomicwrites" ,python-atomicwrites)
("python-click" ,python-click)
("python-click-log" ,python-click-log)
("python-pyxdg" ,python-pyxdg))) ("python-pyxdg" ,python-pyxdg)))
(synopsis "Console calendar program") (synopsis "Console calendar program")
(description "Khal is a standards based console calendar program, (description "Khal is a standards based console calendar program,