;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com>
;;; Copyright © 2016 Stefan Reichoer <stefan@xsteve.at>
-;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module (gnu packages dav)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages glib)
+ #:use-module (gnu packages gtk)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages time)
#:use-module (gnu packages xml)
(define-public libical
(package
(name "libical")
- (version "3.0.4")
+ (version "3.0.7")
(source (origin
(method url-fetch)
(uri (string-append
version "/libical-" version ".tar.gz"))
(sha256
(base32
- "0ifisnh42cw5z53hp9p52l3ggc7k877zlqk0n06gdhrk0bhidckj"))))
+ "1z33wzaazbd7drl6qbh1750whd78xl2cg0gjnxyya9m83vgndgha"))
+ (patches
+ ;; Add a patch slated for 3.0.8 which preserves backwards-
+ ;; compatibility in the icalattach_new_from_data() function,
+ ;; which accidentally changed in 3.0.7 and could break some uses.
+ ;; https://gitlab.gnome.org/GNOME/evolution-data-server/issues/185
+ ;; http://lists.infradead.org/pipermail/libical-devel/2020-January/000907.html
+ (list (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/libical/libical/commit/"
+ "ae394010c889e4c185160da5e81527849f9de350.patch"))
+ (file-name "libical-3.0.7-preserve-icalattach-api.patch")
+ (sha256
+ (base32
+ "0v8qcxn8a6sh78grzxd61j9478928dx38l5mf8mkdrbxv47vmvvp")))))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f ; test suite appears broken
(modify-phases %standard-phases
(add-before 'configure 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
- ;; FIXME: This should be patched to use TZDIR so we can drop
+ ;; TODO: libical 3.1.0 supports using TZDIR instead of a hard-coded
+ ;; zoneinfo database. When that is released we can drop
;; the tzdata dependency.
(let ((tzdata (assoc-ref inputs "tzdata")))
(substitute* "src/libical/icaltz-util.c"
(("\\\"/usr/share/lib/zoneinfo\\\"") "")))
#t)))))
(native-inputs
- `(("perl" ,perl)
+ `(("gtk-doc" ,gtk-doc)
+ ("perl" ,perl)
("pkg-config" ,pkg-config)))
(inputs
`(("glib" ,glib)
(define-public khal
(package
(name "khal")
- (version "0.9.10")
+ (version "0.10.1")
(source (origin
(method url-fetch)
(uri (pypi-uri "khal" version))
(sha256
(base32
- "03h0j0d3xyqh98x5v2gv63wv3g91hip3vsaxvybsn5iz331d23h4"))))
+ "1r8bkgjwkh7i8ygvsv51h1cnax50sb183vafg66x5snxf3dgjl6l"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(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)
(synopsis "Console calendar program")
(description "Khal is a standards based console calendar program,
able to synchronize with CalDAV servers through vdirsyncer.")
- (home-page "http://lostpackets.de/khal/")
+ (home-page "https://lostpackets.de/khal/")
(license license:expat)))
(define-public remind
(package
(name "remind")
- (version "3.1.15")
+ (version "3.1.17")
(source
(origin
(method url-fetch)
- (uri (string-append "https://www.roaringpenguin.com/files/download/"
+ (uri (string-append "https://dianne.skoll.ca/projects/remind/download/"
"remind-"
(string-join (map (cut string-pad <> 2 #\0)
(string-split version #\.))
".")
".tar.gz"))
(sha256
- (base32
- "1hcfcxz5fjzl7606prlb7dgls5kr8z3wb51h48s6qm8ang0b9nla"))))
+ (base32 "0lgyc2j69aqqk4knywr8inz4fsnni0zq54dgqh7p4s6kzybc2mf9"))))
(build-system gnu-build-system)
(arguments
- '(#:tests? #f)) ;no "check" target
- (home-page "http://www.roaringpenguin.com/products/remind/")
+ '(#:tests? #f)) ; no "check" target
+ (home-page "https://dianne.skoll.ca/projects/remind/")
(synopsis "Sophisticated calendar and alarm program")
(description
"Remind allows you to remind yourself of upcoming events and appointments.