~ruther/guix-local: gnu: calibre: Unbundle python2-markdown.

29ec0851707f99fdd14b8c06c26759b98046a8f3 — Brendan Tildesley 8 years ago d94a99e

gnu: calibre: Unbundle python2-markdown.

* gnu/packages/ebook.scm (calibre)[snippet]: Replace python references to
bundled markdown with packaged. Remove markdown from source.
[inputs]: Add python2-markdown as a dependency.

Signed-off-by: Marius Bakke <mbakke@fastmail.com>

patch browse .tar.gz

1 files changed, 6 insertions(+), 1 deletions(-)

M gnu/packages/ebook.scm

M gnu/packages/ebook.scm => gnu/packages/ebook.scm +6 -1

@@ 78,8 78,12 @@
         (modules '((guix build utils)))
         (snippet
           '(begin
+            (delete-file-recursively "src/calibre/ebooks/markdown")
             (delete-file-recursively "src/unrar")
-            (delete-file "src/odf/thumbnail.py")))
+            (delete-file "src/odf/thumbnail.py")
+            (substitute* (find-files "." "\\.py")
+              (("calibre\\.ebooks\\.markdown") "markdown"))
+            #t))
         (patches (search-patches "calibre-drop-unrar.patch"
                                  "calibre-use-packaged-feedparser.patch"
                                  "calibre-dont-load-remote-icons.patch"


@@ 120,6 124,7 @@
        ("python2-dbus" ,python2-dbus)
        ("python2-feedparser" ,python2-feedparser)
        ("python2-lxml" ,python2-lxml)
+       ("python2-markdown" ,python2-markdown)
        ("python2-mechanize" ,python2-mechanize)
        ("python2-netifaces" ,python2-netifaces)
        ("python2-pillow" ,python2-pillow)