;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (gnu packages)
- #:use-module (gnu packages python))
+ #:use-module (gnu packages check)
+ #:use-module (gnu packages python)
+ #:use-module (gnu packages python-web)
+ #:use-module (gnu packages python-xyz)
+ #:use-module (gnu packages sphinx))
(define-public radicale
(package
(name "radicale")
- (version "1.1.1")
+ (version "1.1.6")
(source (origin
(method url-fetch)
(uri (pypi-uri "Radicale" version))
(sha256
(base32
- "1c5lv8qca21mndkx350wxv34qypqh6gb4rhzms4anr642clq3jg2"))))
+ "0ay90nj6fmr2aq8imi0mbjl4m2rzq7a83ikj8qs9gxsylj71j1y0"))))
(build-system python-build-system)
(arguments
'(#:tests? #f)) ; The tests are not distributed in the PyPi release.
Radicale intentionally does not fully comply with the CalDAV and CardDAV RFCs.
Instead, it supports the CalDAV and CardDAV implementations of popular
clients.")
- (home-page "http://radicale.org/")
+ (home-page "https://radicale.org/")
(license gpl3+)))
(define-public vdirsyncer
(package
(name "vdirsyncer")
- (version "0.14.1")
+ ;; When updating, check whether python-click-5 can be removed entirely.
+ (version "0.16.8")
(source (origin
(method url-fetch)
(uri (pypi-uri name version))
- (patches
- (search-patches "vdirsyncer-test-suite-slow-machines.patch"))
(sha256
(base32
- "044f01fjd8dpz4y9dm3qcc1a8cihcxxbr1sz6y6fkvglpb6k85y5"))))
+ "1i8kp9j99rs8xdhrc1vx749zd9wznlzj0pb3s05xdm71a8pl5nxz"))))
(build-system python-build-system)
(arguments
- `(#:phases (modify-phases %standard-phases
- (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)
- (zero? (system* "make" "--directory=docs/" "man"))
- (install-file
- "docs/_build/man/vdirsyncer.1"
- (string-append
- (assoc-ref outputs "out")
- "/share/man/man1")))))))
+ `(#:tests? #f ; The test suite is very flakey.
+ #:phases (modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key inputs outputs tests? #:allow-other-keys)
+ (add-installed-pythonpath inputs outputs)
+ (setenv "DETERMINISTIC_TESTS" "true")
+ (setenv "DAV_SERVER" "radicale")
+ (setenv "REMOTESTORAGE_SERVER" "skip")
+ (if tests?
+ (invoke "make" "test")
+ #t)))
+ (add-after 'unpack 'patch-version-call
+ (lambda _
+ (substitute* "docs/conf.py"
+ (("^release.*") (string-append "release = '" ,version "'\n")))
+ #t))
+ (add-after 'install 'manpage
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (invoke "make" "--directory=docs/" "man")
+ (install-file
+ "docs/_build/man/vdirsyncer.1"
+ (string-append
+ (assoc-ref outputs "out")
+ "/share/man/man1"))
+ #t)))))
(native-inputs
`(("python-setuptools-scm" ,python-setuptools-scm)
("python-sphinx" ,python-sphinx)
("python-pytest" ,python-pytest)
("python-pytest-localserver" ,python-pytest-localserver)
("python-pytest-subtesthack" ,python-pytest-subtesthack)
+ ("python-urllib3" ,python-urllib3)
("python-wsgi-intercept" ,python-wsgi-intercept)
("radicale" ,radicale)))
+ (inputs
+ `(;; XXX https://github.com/mitsuhiko/click/issues/200
+ ("python-click" ,python-click-5)))
(propagated-inputs
`(("python-atomicwrites" ,python-atomicwrites)
- ("python-click" ,python-click)
("python-click-log" ,python-click-log)
("python-click-threading" ,python-click-threading)
("python-requests-toolbelt" ,python-requests-toolbelt)))
synchronize a CalDAV or CardDAV server with a local folder or file. The
local data can then be accessed via a variety of programs, none of which
have to know or worry about syncing to a server.")
- (home-page "https://github.com/untitaker/vdirsyncer")
- (license expat)))
+ (home-page "https://github.com/pimutils/vdirsyncer")
+ (license bsd-3)))