;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name>
+;;; 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>
+;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module (guix download)
#:use-module (guix licenses)
#:use-module (guix packages)
- #:use-module (gnu packages python))
+ #:use-module (guix git-download)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages check)
+ #:use-module (gnu packages python)
+ #:use-module (gnu packages python-check)
+ #:use-module (gnu packages python-crypto)
+ #:use-module (gnu packages python-web)
+ #:use-module (gnu packages python-xyz)
+ #:use-module (gnu packages sphinx)
+ #:use-module (gnu packages time)
+ #:use-module (gnu packages xml))
(define-public radicale
(package
(name "radicale")
- (version "1.1.1")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "Radicale" version))
- (sha256
- (base32
- "1c5lv8qca21mndkx350wxv34qypqh6gb4rhzms4anr642clq3jg2"))))
+ (version "3.0.4")
+ (source
+ (origin
+ ;; There are no tests in the PyPI tarball.
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Kozea/Radicale")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0hj9mmhrj32mzhxlnjcfijb7768cyjsn603nalp54clgb2gkmvw8"))))
(build-system python-build-system)
- (arguments
- '(#:tests? #f)) ; The tests are not distributed in the PyPi release.
+ (native-inputs
+ `(("python-pytest" ,python-pytest)
+ ("python-pytest-cov" ,python-pytest-cov)
+ ("python-pytest-flake8" ,python-pytest-flake8)
+ ("python-pytest-isort" ,python-pytest-isort)
+ ("python-pytest-runner" ,python-pytest-runner)
+ ("python-waitress" ,python-waitress)))
(propagated-inputs
- ;; TODO: Add python-pam
- `(("python-requests" ,python-requests)))
+ `(("python-dateutil" ,python-dateutil)
+ ("python-defusedxml" ,python-defusedxml)
+ ("python-passlib" ,python-passlib)
+ ("python-vobject" ,python-vobject)))
(synopsis "Basic CalDAV and CardDAV server")
(description "Radicale is a CalDAV and CardDAV server for UNIX-like
platforms. Calendars and address books are available for both local and remote
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 xandikos
+ (package
+ (name "xandikos")
+ (version "0.2.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "xandikos" version))
+ (sha256
+ (base32 "13ikmcja9p42azb5ccqj2bw98zybna6zlflj10hqy0kvbib70l94"))))
+ (build-system python-build-system)
+ (propagated-inputs
+ `(("python-aiohttp" ,python-aiohttp)
+ ("python-defusedxml" ,python-defusedxml)
+ ("python-dulwich" ,python-dulwich)
+ ("python-icalendar" ,python-icalendar)
+ ("python-jinja2" ,python-jinja2)
+ ("python-multidict" ,python-multidict)))
+ (home-page "https://www.xandikos.org/")
+ (synopsis "Lightweight CalDAV/CardDAV server")
+ (description
+ "Xandikos is a lightweight yet complete CardDAV/CalDAV server that backs
+onto a Git repository.
+
+Features:
+
+@itemize
+@item Easy to set up
+@item Share calendars (events, todo items, journal entries) via CalDAV and
+contacts (vCard) via CardDAV
+@item Automatically keep history and back up changes in Git
+@item Supports synchronization extensions for CalDAV/CardDAV for quick and
+efficient syncing
+@item Automatically keep history and back up
+@item Works with all tested CalDAV and CardDAV clients
+@end itemize")
(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))
(sha256
(base32
- "044f01fjd8dpz4y9dm3qcc1a8cihcxxbr1sz6y6fkvglpb6k85y5"))))
+ "1i8kp9j99rs8xdhrc1vx749zd9wznlzj0pb3s05xdm71a8pl5nxz"))))
(build-system python-build-system)
(arguments
- `(#:phases (modify-phases %standard-phases
- ;; vdirsyncer requires itself to be installed in order to build
- ;; the manpage.
- (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"))))
- ;; 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")))))))
+ `(#: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)))
HCoop / jackhill / guix / guix.git / blobdiff