mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 23:36:17 +01:00
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:
parent
9d865ef9f6
commit
598266b34c
1 changed files with 8 additions and 12 deletions
|
@ -22,15 +22,16 @@
|
||||||
, libmtp
|
, libmtp
|
||||||
, xdg-utils
|
, xdg-utils
|
||||||
, removeReferencesTo
|
, removeReferencesTo
|
||||||
|
, libstemmer
|
||||||
}:
|
}:
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "calibre";
|
pname = "calibre";
|
||||||
version = "5.17.0";
|
version = "5.24.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
|
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
|
||||||
hash = "sha256-rdiBL3Y3q/0wFfWGE4jGkWakgV8hA9HjDcKXso6tVrs=";
|
hash = "sha256:18dr577nv7ijw3ar6mrk2xrc54mlrqkaj5jrc6s5sirl0710fdfg";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -65,6 +66,7 @@ mkDerivation rec {
|
||||||
libjpeg
|
libjpeg
|
||||||
libmtp
|
libmtp
|
||||||
libpng
|
libpng
|
||||||
|
libstemmer
|
||||||
libusb1
|
libusb1
|
||||||
podofo
|
podofo
|
||||||
poppler_utils
|
poppler_utils
|
||||||
|
@ -73,7 +75,9 @@ mkDerivation rec {
|
||||||
xdg-utils
|
xdg-utils
|
||||||
] ++ (
|
] ++ (
|
||||||
with python3Packages; [
|
with python3Packages; [
|
||||||
apsw
|
(apsw.overrideAttrs (oldAttrs: rec {
|
||||||
|
setupPyBuildFlags = [ "--enable=load_extension" ];
|
||||||
|
}))
|
||||||
beautifulsoup4
|
beautifulsoup4
|
||||||
cchardet
|
cchardet
|
||||||
css-parser
|
css-parser
|
||||||
|
@ -95,15 +99,7 @@ mkDerivation rec {
|
||||||
python
|
python
|
||||||
regex
|
regex
|
||||||
sip
|
sip
|
||||||
(zeroconf.overrideAttrs (oldAttrs: rec {
|
zeroconf
|
||||||
version = "0.31.0";
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "jstasiak";
|
|
||||||
repo = "python-zeroconf";
|
|
||||||
rev = version;
|
|
||||||
sha256 = "158dqay74zvnz6kmpvip4ml0kw59nf2aaajwgaamx0zc8ci1p5pj";
|
|
||||||
};
|
|
||||||
}))
|
|
||||||
# the following are distributed with calibre, but we use upstream instead
|
# the following are distributed with calibre, but we use upstream instead
|
||||||
odfpy
|
odfpy
|
||||||
] ++ lib.optional (unrarSupport) unrardll
|
] ++ lib.optional (unrarSupport) unrardll
|
||||||
|
|
Loading…
Reference in a new issue