diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-02-27 12:42:22 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-02-27 12:42:22 +0100 |
| commit | 8779987bba029535d3dc00f1aacf59281fdd34f0 (patch) | |
| tree | 7a6d616d45367d508f94c3593b1ce5c7053c33f5 /gnu/packages/dav.scm | |
| parent | 1885bb0c08e943a2e0e37c5c0a83473c8af904d0 (diff) | |
| parent | a6d9f8837b118e2126e4b8a19bf48b524229a15c (diff) | |
| download | guix-8779987bba029535d3dc00f1aacf59281fdd34f0.tar.gz guix-8779987bba029535d3dc00f1aacf59281fdd34f0.zip | |
Merge branch 'master' into python-tests
Diffstat (limited to 'gnu/packages/dav.scm')
| -rw-r--r-- | gnu/packages/dav.scm | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm index dd03d8964b..546597c617 100644 --- a/gnu/packages/dav.scm +++ b/gnu/packages/dav.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name> +;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name> ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +21,7 @@ #:use-module (guix download) #:use-module (guix licenses) #:use-module (guix packages) + #:use-module (gnu packages) #:use-module (gnu packages python)) (define-public radicale @@ -58,14 +59,21 @@ clients.") (source (origin (method url-fetch) (uri (pypi-uri name version)) + (patches + (search-patches "vdirsyncer-test-suite-slow-machines.patch")) (sha256 (base32 "044f01fjd8dpz4y9dm3qcc1a8cihcxxbr1sz6y6fkvglpb6k85y5")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - ;; vdirsyncer requires itself to be installed in order to build - ;; the manpage. + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (setenv "DETERMINISTIC_TESTS" "true") + (setenv "DAV_SERVER" "radicale") + (setenv "REMOTESTORAGE_SERVER" "skip") + (zero? (system* "make" "test")))) (add-after 'install 'manpage (lambda* (#:key inputs outputs #:allow-other-keys) (add-installed-pythonpath inputs outputs) @@ -74,16 +82,7 @@ clients.") "docs/_build/man/vdirsyncer.1" (string-append (assoc-ref outputs "out") - "/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"))))))) + "/share/man/man1"))))))) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm) ("python-sphinx" ,python-sphinx) |