public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

calibre: 3.3.0 -> 3.5.0

Browse Source
This commit is contained in:
Johannes Frankenau 2017-07-28 17:46:54 +02:00 committed by Frederik Rietdijk
parent 791e440817
commit d87f53baf9
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/misc/calibre/default.nix
View File

@ -5,12 +5,12 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.3.0"; version = "3.5.0";
name = "calibre-${version}"; name = "calibre-${version}";
src = fetchurl { src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
sha256 = "1zq3aihnyxdczdz8b0w02xfw4b0l9i23f6ljpmsmm69jyh4j3m0c"; sha256 = "1al0vy11zvlxlrf03i631p6b419hy47pbzmgydswrii4prndj4xv";
}; };
patches = [ patches = [
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
# Remove unneeded files and libs # Remove unneeded files and libs
rm -rf resources/calibre-portable.* \ rm -rf resources/calibre-portable.* \
src/{chardet,cherrypy,html5lib,odf,routes} src/odf
''; '';
dontUseQmakeConfigure = true; dontUseQmakeConfigure = true;
@ -49,12 +49,11 @@ stdenv.mkDerivation rec {
poppler_utils libpng imagemagick libjpeg poppler_utils libpng imagemagick libjpeg
fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook
] ++ (with python2Packages; [ ] ++ (with python2Packages; [
html5lib_0_9999999 # needs to be before mechanize ? apsw cssselect cssutils dateutil html5-parser lxml mechanize netifaces pillow
apsw cssselect cssutils dateutil lxml mechanize netifaces pillow
python pyqt5 sip python pyqt5 sip
regex msgpack regex msgpack
# the following are distributed with calibre, but we use upstream instead # the following are distributed with calibre, but we use upstream instead
chardet cherrypy odfpy routes odfpy
]); ]);
installPhase = '' installPhase = ''
@ -91,6 +90,9 @@ stdenv.mkDerivation rec {
substituteAllInPlace $entry substituteAllInPlace $entry
done done
mkdir -p $out/share
cp -a man-pages $out/share/man
runHook postInstall runHook postInstall
''; '';