git.iko.soy/typeable/nixpkgs
on master help sign in
calibre: 2.73.0 -> 2.76.0, fix html5lib, closes #21504
commitc7bff3d71d6ffa8fa4a2c0daa0b974ee011ce469 authorFrederik Rietdijk <fridh@fridh.nl> dateSat 31 Dec 2016, 09:12 (10 years ago) parent59dbcef
2 files changed+4−4
compare with master
unifiedsplit
pkgs/applications/misc/calibre/default.nix+3−3 pkgs/top-level/python-packages.nix+1−1
pkgs/applications/misc/calibre/default.nix+3−3
@@ -5,12 +5,12 @@
55}:
66
77stdenv.mkDerivation rec {
8− version = "2.73.0";
8+ version = "2.76.0";
99 name = "calibre-${version}";
1010
1111 src = fetchurl {
1212 url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
13− sha256 = "17qs7dakzd25wbshsny2x82ppdqa6kwwfbp2vp1i8qmfc1nq61gc";
13+ sha256 = "1xfm586n6gm44mkyn25mbiyhj6w9ji9yl6fvmnr4zk1q6qcga3v8";
1414 };
1515
1616 patches = [
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
5656 apsw beautifulsoup cssselect cssutils dateutil lxml mechanize netifaces pillow
5757 python pyqt5 sip
5858 # the following are distributed with calibre, but we use upstream instead
59− chardet cherrypy html5lib odfpy routes
59+ chardet cherrypy html5lib_0_9999999 odfpy routes
6060 ]);
6161
6262 installPhase = ''
pkgs/top-level/python-packages.nix+1−1
@@ -2808,7 +2808,7 @@ in {
28082808 };
28092809 };
28102810
2811− # Needed for bleach 1.5.0
2811+ # Needed for bleach 1.5.0 and calibre 2.76.0
28122812 html5lib_0_9999999 = self.html5lib.override rec {
28132813 name = "html5lib-${version}";
28142814 buildInputs = with self; [ nose flake8 ];