calibre: 2.73.0 -> 2.76.0, fix html5lib, closes #21504

Changed files
+4 -4
pkgs
applications
misc
calibre
top-level
+3 -3
pkgs/applications/misc/calibre/default.nix
···
}:
stdenv.mkDerivation rec {
-
version = "2.73.0";
+
version = "2.76.0";
name = "calibre-${version}";
src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-
sha256 = "17qs7dakzd25wbshsny2x82ppdqa6kwwfbp2vp1i8qmfc1nq61gc";
+
sha256 = "1xfm586n6gm44mkyn25mbiyhj6w9ji9yl6fvmnr4zk1q6qcga3v8";
};
patches = [
···
apsw beautifulsoup cssselect cssutils dateutil lxml mechanize netifaces pillow
python pyqt5 sip
# the following are distributed with calibre, but we use upstream instead
-
chardet cherrypy html5lib odfpy routes
+
chardet cherrypy html5lib_0_9999999 odfpy routes
]);
installPhase = ''
+1 -1
pkgs/top-level/python-packages.nix
···
};
};
-
# Needed for bleach 1.5.0
+
# Needed for bleach 1.5.0 and calibre 2.76.0
html5lib_0_9999999 = self.html5lib.override rec {
name = "html5lib-${version}";
buildInputs = with self; [ nose flake8 ];