nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: khal: Update to 0.8.3. 

* gnu/packages/calendar.scm (khal): Update to 0.8.3.
[source]: Remove snippet.
[arguments]: Remove 'disable-tests' phase.
[native-inputs]: Add python-pytest-cov and python-freezegun.

Signed-off-by: Leo Famulari <leo@famulari.name>
This commit is contained in:
Troy Sankey 2016-08-14 13:38:33 -04:00 committed by Leo Famulari
parent f2f5335393
commit bc8273d0c2
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
1 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gnu/packages/calendar.scm
View File

@ -3,6 +3,7 @@
;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org> ;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -80,42 +81,16 @@ data units.")
(define-public khal (define-public khal
(package (package
(name "khal") (name "khal")
(version "0.7.0") (version "0.8.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "khal" version)) (uri (pypi-uri "khal" version))
(sha256 (sha256
(base32 (base32
"00llxj7cv31mjsx0j6zxmyi9s1q20yvfkn025xcy8cv1ylfwic66")) "1qryqs5d8jsl7j22pjjfkfdi4m8m3nn3n44b890pq85xkw599ihy"))))
(modules '((guix build utils)))
;; Patch broken path in 'doc' Makefile.
;; Patch sent upstream: https://github.com/geier/khal/pull/307
(snippet
'(substitute* "doc/source/Makefile"
(("../../../khal/khal/settings/khal.spec")
"../../khal/settings/khal.spec" )))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
(add-after 'unpack 'disable-tests
(lambda _
;; Bug reported for test_only_update_old_event:
;; https://github.com/geier/khal/issues/309
(substitute* "tests/khalendar_test.py"
(("test_only_update_old_event")
"disabled_only_update_old_event"))
;; Bug reported for test_dt_two_tz:
;; https://github.com/pimutils/khal/issues/382
(substitute* "tests/event_test.py"
(("test_dt_two_tz")
"disabled_dt_two_tz"))
;; Another timezone / DST issue:
;; https://github.com/pimutils/khal/issues/146
(substitute* "tests/event_test.py"
(("test_raw_dt")
"disabled_raw_dt"))))
;; Building the manpage requires khal to be installed. ;; Building the manpage requires khal to be installed.
(add-after 'install 'manpage (add-after 'install 'manpage
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
@ -136,9 +111,11 @@ data units.")
(zero? (system* "py.test" "tests"))))))) (zero? (system* "py.test" "tests")))))))
(native-inputs (native-inputs
`(("python-pytest" ,python-pytest) `(("python-pytest" ,python-pytest)
("python-pytest-cov" ,python-pytest-cov)
("python-setuptools-scm" ,python-setuptools-scm) ("python-setuptools-scm" ,python-setuptools-scm)
;; Required for tests ;; Required for tests
("tzdata" ,tzdata) ("tzdata" ,tzdata)
("python-freezegun" ,python-freezegun)
;; Required to build manpage ;; Required to build manpage
("python-sphinxcontrib-newsfeed" ,python-sphinxcontrib-newsfeed) ("python-sphinxcontrib-newsfeed" ,python-sphinxcontrib-newsfeed)
("python-sphinx" ,python-sphinx))) ("python-sphinx" ,python-sphinx)))