calibre: 5.17.0 -> 5.24.0

- No need to pin zeroconf to older version.
- Override apsw to compile with load_extension support. [1]

[1] https://bugs.launchpad.net/calibre/+bug/1935747
This commit is contained in:
Mukund Lakshman 2021-07-31 19:33:49 +01:00
parent 9d865ef9f6
commit 598266b34c

View file

@ -22,15 +22,16 @@
, libmtp
, xdg-utils
, removeReferencesTo
, libstemmer
}:
mkDerivation rec {
pname = "calibre";
version = "5.17.0";
version = "5.24.0";
src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
hash = "sha256-rdiBL3Y3q/0wFfWGE4jGkWakgV8hA9HjDcKXso6tVrs=";
hash = "sha256:18dr577nv7ijw3ar6mrk2xrc54mlrqkaj5jrc6s5sirl0710fdfg";
};
patches = [
@ -65,6 +66,7 @@ mkDerivation rec {
libjpeg
libmtp
libpng
libstemmer
libusb1
podofo
poppler_utils
@ -73,7 +75,9 @@ mkDerivation rec {
xdg-utils
] ++ (
with python3Packages; [
apsw
(apsw.overrideAttrs (oldAttrs: rec {
setupPyBuildFlags = [ "--enable=load_extension" ];
}))
beautifulsoup4
cchardet
css-parser
@ -95,15 +99,7 @@ mkDerivation rec {
python
regex
sip
(zeroconf.overrideAttrs (oldAttrs: rec {
version = "0.31.0";
src = fetchFromGitHub {
owner = "jstasiak";
repo = "python-zeroconf";
rev = version;
sha256 = "158dqay74zvnz6kmpvip4ml0kw59nf2aaajwgaamx0zc8ci1p5pj";
};
}))
zeroconf
# the following are distributed with calibre, but we use upstream instead
odfpy
] ++ lib.optional (unrarSupport) unrardll