about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2016-12-31 09:12:41 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2016-12-31 09:12:41 +0100
commitc7bff3d71d6ffa8fa4a2c0daa0b974ee011ce469 (patch)
treea02164c442349a0502dfc14409bd1bc3679cd818
parent59dbcefaa74b940f9b7490c034dc4ff885fa2627 (diff)
downloadnixlib-c7bff3d71d6ffa8fa4a2c0daa0b974ee011ce469.tar
nixlib-c7bff3d71d6ffa8fa4a2c0daa0b974ee011ce469.tar.gz
nixlib-c7bff3d71d6ffa8fa4a2c0daa0b974ee011ce469.tar.bz2
nixlib-c7bff3d71d6ffa8fa4a2c0daa0b974ee011ce469.tar.lz
nixlib-c7bff3d71d6ffa8fa4a2c0daa0b974ee011ce469.tar.xz
nixlib-c7bff3d71d6ffa8fa4a2c0daa0b974ee011ce469.tar.zst
nixlib-c7bff3d71d6ffa8fa4a2c0daa0b974ee011ce469.zip
calibre: 2.73.0 -> 2.76.0, fix html5lib, closes #21504
-rw-r--r--pkgs/applications/misc/calibre/default.nix6
-rw-r--r--pkgs/top-level/python-packages.nix2
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index b98d327d3b8a..5c05d1e17873 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 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 = [
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     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 = ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 06fe9cbf1b2f..d94c2021d3fb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -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 {
     name = "html5lib-${version}";
     buildInputs = with self; [ nose flake8 ];