diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-04-19 16:53:01 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-19 16:53:01 +0200 |
commit | 7abe35febe4234609e14e169b6fcc0cbaf4c7119 (patch) | |
tree | 5a8307a28e0c0a6aeab21ce8b9d3487229522588 /gnu/packages/calendar.scm | |
parent | 457ded48c54ba04489cb871d3ec6bda0c59bead7 (diff) | |
parent | 5c10d55206a4f7a9b932ff08512a4f50c1db35be (diff) | |
download | guix-7abe35febe4234609e14e169b6fcc0cbaf4c7119.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/calendar.scm')
-rw-r--r-- | gnu/packages/calendar.scm | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 5132a9d8ab..104d61148a 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -186,7 +186,17 @@ data units.") (uri (pypi-uri "khal" version)) (sha256 (base32 - "1r8bkgjwkh7i8ygvsv51h1cnax50sb183vafg66x5snxf3dgjl6l")))) + "1r8bkgjwkh7i8ygvsv51h1cnax50sb183vafg66x5snxf3dgjl6l")) + (patches + (list + (origin + (method url-fetch) + ;; This patch fixes an issue with python-urwid-2.1.0 + (uri "https://github.com/pimutils/khal/commit/2c5990c2de2015b251ba23617faa40ee11b8c22a.patch") + (file-name "khal-compat-urwid-2.1.0.patch") + (sha256 + (base32 + "11nd8hkjz68imwqqn0p54zmb53z2pfxmzchaviy7jc1ky5s9l663"))))))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -219,9 +229,8 @@ data units.") ("python-sphinxcontrib-newsfeed" ,python-sphinxcontrib-newsfeed) ("python-sphinx" ,python-sphinx))) (inputs - `(("sqlite" ,sqlite))) - (propagated-inputs - `(("python-configobj" ,python-configobj) + `(("sqlite" ,sqlite) + ("python-configobj" ,python-configobj) ("python-dateutil" ,python-dateutil) ("python-icalendar" ,python-icalendar) ("python-tzlocal" ,python-tzlocal) |