diff options
| author | Leo Famulari <leo@famulari.name> | 2016-03-21 12:22:31 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-03-21 12:22:31 -0400 |
| commit | 09ec508a4c14d1bc09622d98f796548d79ab0552 (patch) | |
| tree | 86cc5a2a67d35ad796bfa33d67869d670d65822e /gnu/packages/dav.scm | |
| parent | 2dbed47f5c09347c9af42c5f5bacfccbc1ab4aff (diff) | |
| parent | 71cafa0472a15f2234e24d3c6d8019ebb38685b0 (diff) | |
| download | guix-09ec508a4c14d1bc09622d98f796548d79ab0552.tar guix-09ec508a4c14d1bc09622d98f796548d79ab0552.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/dav.scm')
| -rw-r--r-- | gnu/packages/dav.scm | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm index 4562193114..de984faf33 100644 --- a/gnu/packages/dav.scm +++ b/gnu/packages/dav.scm @@ -52,21 +52,16 @@ clients.") (define-public vdirsyncer (package (name "vdirsyncer") - (version "0.9.0") + (version "0.9.2") (source (origin (method url-fetch) (uri (pypi-uri "vdirsyncer" version)) (sha256 (base32 - "0s9awjr9v60rr80xcpwmdhkf4v1yqnydahjmxwvxmh64565is465")))) + "1g1107cz4sk41d2z6k6pn9n2fzd26m72j8aj33zn483vfvmyrc4q")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - (replace 'check - (lambda _ - (setenv "DAV_SERVER" "radicale") - (setenv "REMOTESTORAGE_SERVER" "skip") - (zero? (system* "py.test")))) ;; vdirsyncer requires itself to be installed in order to build ;; the manpage. (add-after 'install 'manpage @@ -80,17 +75,24 @@ clients.") "docs/_build/man/vdirsyncer.1" (string-append (assoc-ref outputs "out") - "/share/man/man1"))))))) + "/share/man/man1")))) + ;; vdirsyncer requires itself to be installed in order to run the test + ;; suite. + (delete 'check) + (add-after 'install 'check-later + (lambda _ + (setenv "DETERMINISTIC_TESTS" "true") + (setenv "DAV_SERVER" "radicale") + (setenv "REMOTESTORAGE_SERVER" "skip") + (zero? (system* "make" "test"))))))) (native-inputs - `(("python-oauthlib" ,python-oauthlib) - ("python-setuptools-scm" ,python-setuptools-scm) + `(("python-setuptools-scm" ,python-setuptools-scm) ("python-sphinx" ,python-sphinx) ;; Required for testing ("python-hypothesis" ,python-hypothesis) ("python-pytest" ,python-pytest) ("python-pytest-localserver" ,python-pytest-localserver) ("python-pytest-subtesthack" ,python-pytest-subtesthack) - ("python-pytest-xprocess" ,python-pytest-xprocess) ("python-wsgi-intercept" ,python-wsgi-intercept) ("radicale" ,radicale))) (propagated-inputs @@ -98,7 +100,7 @@ clients.") ("python-click" ,python-click) ("python-click-log" ,python-click-log) ("python-click-threading" ,python-click-threading) - ("python-lxml" ,python-lxml) ; which one? + ("python-lxml" ,python-lxml) ("python-requests-toolbelt" ,python-requests-toolbelt))) (synopsis "Synchronize calendars and contacts") (description "Vdirsyncer synchronizes your calendars and addressbooks |