From b9dd2a2fb7dda8b2b9686e8e4bf5cca19514a08d Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Fri, 17 Apr 2020 10:40:17 +0300
Subject: gnu: khal: Fix build with python-urwid-2.1.0.

* gnu/packages/calendar.scm (khal)[source]: Download upstream patch to
fix compatibility with newer python-urwid.
---
 gnu/packages/calendar.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/calendar.scm')

diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
index bd47800d1d..291221bc26 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -180,7 +180,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
-- 
cgit v1.2.3


From c135577dbf916bcde7e90683bff82dd505b571f7 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Fri, 17 Apr 2020 10:42:41 +0300
Subject: gnu: khal: Move propagated inputs to inputs.

As a package one would install we can rely on wrapping the package and
not propagating inputs to make it work correctly.

* gnu/packages/calendar.scm (khal)[propagated-inputs]: Move all python
packages...
[inputs]: ... to here.
---
 gnu/packages/calendar.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/calendar.scm')

diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
index 291221bc26..81b2b436c1 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -223,9 +223,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)
-- 
cgit v1.2.3