[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/09: gnu: calibre: Unbundle python2-markdown.
From: |
Marius Bakke |
Subject: |
04/09: gnu: calibre: Unbundle python2-markdown. |
Date: |
Fri, 19 May 2017 17:58:14 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit 29ec0851707f99fdd14b8c06c26759b98046a8f3
Author: Brendan Tildesley <address@hidden>
Date: Sat May 13 23:24:06 2017 +1000
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 <address@hidden>
---
gnu/packages/ebook.scm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 70ec9ed..e751831 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -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)
- branch master updated (b55dd31 -> 1326166), Marius Bakke, 2017/05/19
- 04/09: gnu: calibre: Unbundle python2-markdown.,
Marius Bakke <=
- 06/09: gnu: calibre: Unbundle chardet., Marius Bakke, 2017/05/19
- 01/09: gnu: calibre: Update to 2.85.1., Marius Bakke, 2017/05/19
- 07/09: gnu: calibre: Add missing dependencies., Marius Bakke, 2017/05/19
- 09/09: gnu: calibre: Don't create uninstaller., Marius Bakke, 2017/05/19
- 08/09: gnu: calibre: Add exhaustive license list., Marius Bakke, 2017/05/19
- 03/09: gnu: calibre: Import unbundle feedparser patch from debian., Marius Bakke, 2017/05/19
- 05/09: gnu: calibre: Unbundle liberation fonts., Marius Bakke, 2017/05/19
- 02/09: gnu: calibre: Import dont-load-icons patch from debian., Marius Bakke, 2017/05/19