nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Brendan Tildesley 2017-05-13 23:24:06 +10:00 committed by Marius Bakke
parent d94a99ec66
commit 29ec085170
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/packages/ebook.scm
View File

@ -78,8 +78,12 @@
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
(delete-file-recursively "src/calibre/ebooks/markdown")
(delete-file-recursively "src/unrar") (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" (patches (search-patches "calibre-drop-unrar.patch"
"calibre-use-packaged-feedparser.patch" "calibre-use-packaged-feedparser.patch"
"calibre-dont-load-remote-icons.patch" "calibre-dont-load-remote-icons.patch"
@ -120,6 +124,7 @@
("python2-dbus" ,python2-dbus) ("python2-dbus" ,python2-dbus)
("python2-feedparser" ,python2-feedparser) ("python2-feedparser" ,python2-feedparser)
("python2-lxml" ,python2-lxml) ("python2-lxml" ,python2-lxml)
("python2-markdown" ,python2-markdown)
("python2-mechanize" ,python2-mechanize) ("python2-mechanize" ,python2-mechanize)
("python2-netifaces" ,python2-netifaces) ("python2-netifaces" ,python2-netifaces)
("python2-pillow" ,python2-pillow) ("python2-pillow" ,python2-pillow)