diff options
author | Anderson Torres <torres.anderson.85@protonmail.com> | 2021-08-01 00:19:49 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-01 00:19:49 -0300 |
commit | 680a4a46cbce7989cfaf207317d86000c28e359f (patch) | |
tree | f4405c5e7c5977148ddf27807e3ec884c535264a /pkgs/applications | |
parent | 404cd360c2607bcfe8d05a7d5ae609d6605f7e22 (diff) | |
parent | 598266b34c7c6cccd26f8c65c16d9397932153d7 (diff) | |
download | nixpkgs-680a4a46cbce7989cfaf207317d86000c28e359f.tar nixpkgs-680a4a46cbce7989cfaf207317d86000c28e359f.tar.gz nixpkgs-680a4a46cbce7989cfaf207317d86000c28e359f.tar.bz2 nixpkgs-680a4a46cbce7989cfaf207317d86000c28e359f.tar.lz nixpkgs-680a4a46cbce7989cfaf207317d86000c28e359f.tar.xz nixpkgs-680a4a46cbce7989cfaf207317d86000c28e359f.tar.zst nixpkgs-680a4a46cbce7989cfaf207317d86000c28e359f.zip |
Merge pull request #132238 from yaymukund/calibre-5.24.0
calibre: 5.17.0 -> 5.24.0
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 07e0a62b901..85a644e5f1b 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -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 |