git.iko.soy/typeable/nixpkgs
on master help sign in
calibre: 2.73.0 -> 2.76.0, fix html5lib, closes #21504
c7bff3dFrederik Rietdijk
pkgs/applications/misc/calibre/default.nix+3−3
compare with master
unifiedsplit
@@ -5,12 +5,12 @@
5}:
5}:
6
6
7stdenv.mkDerivation rec {
7stdenv.mkDerivation rec {
8− version = "2.73.0";
8+ version = "2.76.0";
9 name = "calibre-${version}";
9 name = "calibre-${version}";
10
10
11 src = fetchurl {
11 src = fetchurl {
12 url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
12 url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
13− sha256 = "17qs7dakzd25wbshsny2x82ppdqa6kwwfbp2vp1i8qmfc1nq61gc";
13+ sha256 = "1xfm586n6gm44mkyn25mbiyhj6w9ji9yl6fvmnr4zk1q6qcga3v8";
14 };
14 };
15
15
16 patches = [
16 patches = [
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
56 apsw beautifulsoup cssselect cssutils dateutil lxml mechanize netifaces pillow
56 apsw beautifulsoup cssselect cssutils dateutil lxml mechanize netifaces pillow
57 python pyqt5 sip
57 python pyqt5 sip
58 # the following are distributed with calibre, but we use upstream instead
58 # 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
60 ]);
60 ]);
61
61
62 installPhase = ''
62 installPhase = ''
pkgs/top-level/python-packages.nix+1−1
@@ -2808,7 +2808,7 @@ in {
2808 };
2808 };
2809 };
2809 };
2810
2810
2811− # Needed for bleach 1.5.0
2811+ # Needed for bleach 1.5.0 and calibre 2.76.0
2812 html5lib_0_9999999 = self.html5lib.override rec {
2812 html5lib_0_9999999 = self.html5lib.override rec {
2813 name = "html5lib-${version}";
2813 name = "html5lib-${version}";
2814 buildInputs = with self; [ nose flake8 ];
2814 buildInputs = with self; [ nose flake8 ];