alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

calibre: use bundled html5lib

Browse source 
The bundled html5lib may be old and insecure, but that's all upstream
supports. Since dependencies are now requiring a newer html5lib we have
no choice but to let it use the bundled version.
This commit is contained in:
Frederik Rietdijk 2017-07-07 18:35:50 +02:00
parent bdabf6a6f2
commit ff5423cdca
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/misc/calibre/default.nix
View file

@ -5,12 +5,12 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.1.1"; version = "3.3.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 = "1lh1gz0915r49igfhy1icz79qx36s3d8m32qlih0g3zn7jahp86g"; sha256 = "1zq3aihnyxdczdz8b0w02xfw4b0l9i23f6ljpmsmm69jyh4j3m0c";
}; };
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/{chardet,cherrypy,odf,routes}
''; '';
dontUseQmakeConfigure = true; dontUseQmakeConfigure = true;
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
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 html5lib_0_9999999 odfpy routes chardet cherrypy odfpy routes
]); ]);
installPhase = '' installPhase = ''