diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-04-01 00:02:39 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-04-01 00:02:39 +0200 |
commit | 571fb008a576378883c053be186d2c620290ea39 (patch) | |
tree | 5279a2c2772a9b76299a48d697d568f208a89722 /gnu/packages/calendar.scm | |
parent | 7c86fdda7ceed11377b0e17b47c91598be59be52 (diff) | |
parent | f125c5a5ea03d53749f45d310694b79241d5888d (diff) | |
download | guix-571fb008a576378883c053be186d2c620290ea39.tar guix-571fb008a576378883c053be186d2c620290ea39.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/calendar.scm')
-rw-r--r-- | gnu/packages/calendar.scm | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 226d8f57e2..90f23452f7 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -96,13 +96,13 @@ data units.") (define-public khal (package (name "khal") - (version "0.9.10") + (version "0.10.0") (source (origin (method url-fetch) (uri (pypi-uri "khal" version)) (sha256 (base32 - "03h0j0d3xyqh98x5v2gv63wv3g91hip3vsaxvybsn5iz331d23h4")))) + "1p49f3g25x900vk32spjbr2aipj12kcbhayny2vwhdpkjlv6k396")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -122,22 +122,14 @@ data units.") (setenv "TZ" (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo/Zulu")) - (invoke "py.test" "tests" "-k" - (string-append - ;; These tests are known to fail in when not - ;; running in a TTY: - ;; https://github.com/pimutils/khal/issues/683 - "not test_printics_read_from_stdin " - "and not test_import_from_stdin " - ;; https://github.com/pimutils/khal/issues/825 - "and not test_description_and_location_and_categories"))))))) + (invoke "py.test" "tests")))))) (native-inputs `(("python-pytest" ,python-pytest) ("python-pytest-cov" ,python-pytest-cov) ("python-setuptools-scm" ,python-setuptools-scm) ;; Required for tests ("python-freezegun" ,python-freezegun) - ("tzdata" ,tzdata) + ("tzdata" ,tzdata-for-tests) ("vdirsyncer" ,vdirsyncer) ;; Required to build manpage ("python-sphinxcontrib-newsfeed" ,python-sphinxcontrib-newsfeed) |