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

+4 -4
+3 -3
pkgs/applications/misc/calibre/default.nix
··· 5 }: 6 7 stdenv.mkDerivation rec { 8 - version = "2.73.0"; 9 name = "calibre-${version}"; 10 11 src = fetchurl { 12 url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; 13 - sha256 = "17qs7dakzd25wbshsny2x82ppdqa6kwwfbp2vp1i8qmfc1nq61gc"; 14 }; 15 16 patches = [ ··· 56 apsw beautifulsoup cssselect cssutils dateutil lxml mechanize netifaces pillow 57 python pyqt5 sip 58 # the following are distributed with calibre, but we use upstream instead 59 - chardet cherrypy html5lib odfpy routes 60 ]); 61 62 installPhase = ''
··· 5 }: 6 7 stdenv.mkDerivation rec { 8 + version = "2.76.0"; 9 name = "calibre-${version}"; 10 11 src = fetchurl { 12 url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; 13 + sha256 = "1xfm586n6gm44mkyn25mbiyhj6w9ji9yl6fvmnr4zk1q6qcga3v8"; 14 }; 15 16 patches = [ ··· 56 apsw beautifulsoup cssselect cssutils dateutil lxml mechanize netifaces pillow 57 python pyqt5 sip 58 # the following are distributed with calibre, but we use upstream instead 59 + chardet cherrypy html5lib_0_9999999 odfpy routes 60 ]); 61 62 installPhase = ''
+1 -1
pkgs/top-level/python-packages.nix
··· 2808 }; 2809 }; 2810 2811 - # Needed for bleach 1.5.0 2812 html5lib_0_9999999 = self.html5lib.override rec { 2813 name = "html5lib-${version}"; 2814 buildInputs = with self; [ nose flake8 ];
··· 2808 }; 2809 }; 2810 2811 + # Needed for bleach 1.5.0 and calibre 2.76.0 2812 html5lib_0_9999999 = self.html5lib.override rec { 2813 name = "html5lib-${version}"; 2814 buildInputs = with self; [ nose flake8 ];