From e89aceab635ad053244586ef430162e4817d8f64 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 2 Dec 2016 13:56:10 +0100 Subject: gnu: calibre: Do not use python setuptools for building. * gnu/packages/ebook.scm (calibre)[arguments]: Set #:use-setuptools? to false. --- gnu/packages/ebook.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/ebook.scm') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index ad1871688e..3843fb2092 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -126,6 +126,9 @@ `(#:python ,python-2 #:test-target "check" #:tests? #f ; FIXME: enable once flake8 is packaged + ;; Calibre is using setuptools by itself, but the setup.py is not + ;; compatible with the shim wrapper (taken from pip) we are using. + #:use-setuptools? #f #:phases (modify-phases %standard-phases (add-before 'build 'configure -- cgit v1.2.3 From c5ea912016fdba6a1debe6eef7fbd51e59efb9a5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 11 Dec 2016 21:55:07 +0200 Subject: gnu: calibre: Update qt dependancies. * gnu/packages/ebook.scm (calibre)[native-inputs]: Remove qt, add qtbase. [inputs]: Remove qt, replace python2-pyqt@5.5 with python2-pyqt. --- gnu/packages/ebook.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/ebook.scm') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 3843fb2092..c68e643cf0 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -83,7 +83,7 @@ (build-system python-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("qt" ,qt) ; for qmake + ("qtbase" ,qtbase) ; for qmake ;; xdg-utils is supposed to be used for desktop integration, but it ;; also creates lots of messages ;; mkdir: cannot create directory '/homeless-shelter': Permission denied @@ -118,9 +118,8 @@ ("python2-mechanize" ,python2-mechanize) ("python2-netifaces" ,python2-netifaces) ("python2-pillow" ,python2-pillow) - ("python2-pyqt" ,python2-pyqt-5.5) + ("python2-pyqt" ,python2-pyqt) ("python2-sip" ,python2-sip) - ("qt" ,qt) ("sqlite" ,sqlite))) (arguments `(#:python ,python-2 -- cgit v1.2.3 From 987ad88fb6d6b133e5f4bf499610700336d1dd07 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 12 Dec 2016 13:12:51 +0200 Subject: gnu: calibre: Update to 2.74.0. * gnu/packages/ebook.scm (calibre): Update to 2.74.0. --- gnu/packages/ebook.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/ebook.scm') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index c68e643cf0..1a030ce4e0 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -61,7 +61,7 @@ (define-public calibre (package (name "calibre") - (version "2.63.0") + (version "2.74.0") (source (origin (method url-fetch) @@ -70,7 +70,7 @@ version ".tar.xz")) (sha256 (base32 - "1rwgv6rsmy3ljfwcpv42w203ghngw86s5kzb0yjm1zgsxmas2wh6")) + "1dpz1682zd8anvgafk2m5m123dxy1bc07ysj0z1my7zqaq1cyrm3")) ;; Remove non-free or doubtful code, see ;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html (modules '((guix build utils))) -- cgit v1.2.3 From 37e8a2e219b21a43f80e9cf8581db1b1e2f67105 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Tue, 3 Jan 2017 10:36:52 -0600 Subject: gnu: calibre: Update to 2.76.0. * gnu/packages/ebook.scm (calibre): Update to 2.76.0. Signed-off-by: Leo Famulari --- gnu/packages/ebook.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/ebook.scm') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 1a030ce4e0..0a53e6ca99 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016 Andreas Enge ;;; Copyright © 2016 Efraim Flashner -;;; Copyright © 2016 Alex Griffin +;;; Copyright © 2016, 2017 Alex Griffin ;;; ;;; This file is part of GNU Guix. ;;; @@ -61,7 +61,7 @@ (define-public calibre (package (name "calibre") - (version "2.74.0") + (version "2.76.0") (source (origin (method url-fetch) @@ -70,7 +70,7 @@ version ".tar.xz")) (sha256 (base32 - "1dpz1682zd8anvgafk2m5m123dxy1bc07ysj0z1my7zqaq1cyrm3")) + "1xfm586n6gm44mkyn25mbiyhj6w9ji9yl6fvmnr4zk1q6qcga3v8")) ;; Remove non-free or doubtful code, see ;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html (modules '((guix build utils))) -- cgit v1.2.3