public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Frederik Rietdijk 2016-12-31 09:12:41 +01:00
parent 59dbcefaa7
commit c7bff3d71d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/calibre/default.nix
View File

@ -5,12 +5,12 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.73.0"; version = "2.76.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 = "17qs7dakzd25wbshsny2x82ppdqa6kwwfbp2vp1i8qmfc1nq61gc"; sha256 = "1xfm586n6gm44mkyn25mbiyhj6w9ji9yl6fvmnr4zk1q6qcga3v8";
}; };
patches = [ patches = [
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
apsw beautifulsoup cssselect cssutils dateutil lxml mechanize netifaces pillow apsw beautifulsoup cssselect cssutils dateutil lxml mechanize netifaces pillow
python pyqt5 sip python pyqt5 sip
# 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 odfpy routes chardet cherrypy html5lib_0_9999999 odfpy routes
]); ]);
installPhase = '' installPhase = ''

2
pkgs/top-level/python-packages.nix
View File

@ -2808,7 +2808,7 @@ in {
}; };
}; };
# Needed for bleach 1.5.0 # Needed for bleach 1.5.0 and calibre 2.76.0
html5lib_0_9999999 = self.html5lib.override rec { html5lib_0_9999999 = self.html5lib.override rec {
name = "html5lib-${version}"; name = "html5lib-${version}";
buildInputs = with self; [ nose flake8 ]; buildInputs = with self; [ nose flake8 ];