gnu: calibre: Unbundle python2-odfpy.

* gnu/packages/ebook.scm (calibre)[snippet]: Remove all of src/odf.
[inputs]: Add python2-odfpy.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
This commit is contained in:
Brendan Tildesley 2019-05-05 14:33:35 +02:00 committed by Danny Milosavljevic
parent 7312a7d073
commit 68435a7f55
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
1 changed files with 4 additions and 3 deletions

View File

@ -89,13 +89,13 @@
(sha256 (sha256
(base32 (base32
"167hhv4wimkjnyfgqkyqmaiixhicbxacy6190gps98jyj4csi8ra")) "167hhv4wimkjnyfgqkyqmaiixhicbxacy6190gps98jyj4csi8ra"))
;; Remove non-free or doubtful code, see ;; Unbundle python2-odfpy.
;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html ;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
(delete-file "src/odf/thumbnail.py") (delete-file-recursively "src/odf")
#t)) #t))
(patches (search-patches "calibre-no-updates-dialog.patch" (patches (search-patches "calibre-no-updates-dialog.patch"
"calibre-remove-test-bs4.patch" ; TODO: fix test. "calibre-remove-test-bs4.patch" ; TODO: fix test.
"calibre-remove-test-sqlite.patch" ; TODO: fix test. "calibre-remove-test-sqlite.patch" ; TODO: fix test.
@ -141,6 +141,7 @@
;; python2-msgpack is needed for the network content server to work. ;; python2-msgpack is needed for the network content server to work.
("python2-msgpack" ,python2-msgpack) ("python2-msgpack" ,python2-msgpack)
("python2-netifaces" ,python2-netifaces) ("python2-netifaces" ,python2-netifaces)
("python2-odfpy" ,python2-odfpy)
("python2-pillow" ,python2-pillow) ("python2-pillow" ,python2-pillow)
("python2-psutil" ,python2-psutil) ("python2-psutil" ,python2-psutil)
("python2-pygments" ,python2-pygments) ("python2-pygments" ,python2-pygments)