diff options
author | Johannes Frankenau <johannes@frankenau.net> | 2017-07-28 17:46:54 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-08-14 09:33:02 +0200 |
commit | d87f53baf90f4d7505c63916d75e89daac9de1eb (patch) | |
tree | ab882a9cf549a30cc534a108ed14593723b29242 /pkgs/applications/misc | |
parent | 791e440817166e7215ae6d6dc54828f7de670c01 (diff) | |
download | nixlib-d87f53baf90f4d7505c63916d75e89daac9de1eb.tar nixlib-d87f53baf90f4d7505c63916d75e89daac9de1eb.tar.gz nixlib-d87f53baf90f4d7505c63916d75e89daac9de1eb.tar.bz2 nixlib-d87f53baf90f4d7505c63916d75e89daac9de1eb.tar.lz nixlib-d87f53baf90f4d7505c63916d75e89daac9de1eb.tar.xz nixlib-d87f53baf90f4d7505c63916d75e89daac9de1eb.tar.zst nixlib-d87f53baf90f4d7505c63916d75e89daac9de1eb.zip |
calibre: 3.3.0 -> 3.5.0
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 8341898fa233..6ca457cc1d37 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.3.0"; + version = "3.5.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "1zq3aihnyxdczdz8b0w02xfw4b0l9i23f6ljpmsmm69jyh4j3m0c"; + sha256 = "1al0vy11zvlxlrf03i631p6b419hy47pbzmgydswrii4prndj4xv"; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # Remove unneeded files and libs rm -rf resources/calibre-portable.* \ - src/{chardet,cherrypy,html5lib,odf,routes} + src/odf ''; dontUseQmakeConfigure = true; @@ -49,12 +49,11 @@ stdenv.mkDerivation rec { poppler_utils libpng imagemagick libjpeg fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook ] ++ (with python2Packages; [ - html5lib_0_9999999 # needs to be before mechanize ? - apsw cssselect cssutils dateutil lxml mechanize netifaces pillow + apsw cssselect cssutils dateutil html5-parser lxml mechanize netifaces pillow python pyqt5 sip regex msgpack # the following are distributed with calibre, but we use upstream instead - chardet cherrypy odfpy routes + odfpy ]); installPhase = '' @@ -91,6 +90,9 @@ stdenv.mkDerivation rec { substituteAllInPlace $entry done + mkdir -p $out/share + cp -a man-pages $out/share/man + runHook postInstall ''; |