summary refs log tree commit diff
diff options
context:
space:
mode:
authorPascal Wittmann <mail@pascal-wittmann.de>2019-04-21 18:34:27 +0200
committerGitHub <noreply@github.com>2019-04-21 18:34:27 +0200
commit694f07be2effcd2b7d70ccad3dbdbd267519810a (patch)
tree71b135637e471efd465f9ce52ba9ee702f773b21
parentdf448f0993173bfed26be41d246902fbd9219681 (diff)
parentb26b480f27de9f08388d72f5fb40ef039aa37ea7 (diff)
downloadnixpkgs-694f07be2effcd2b7d70ccad3dbdbd267519810a.tar
nixpkgs-694f07be2effcd2b7d70ccad3dbdbd267519810a.tar.gz
nixpkgs-694f07be2effcd2b7d70ccad3dbdbd267519810a.tar.bz2
nixpkgs-694f07be2effcd2b7d70ccad3dbdbd267519810a.tar.lz
nixpkgs-694f07be2effcd2b7d70ccad3dbdbd267519810a.tar.xz
nixpkgs-694f07be2effcd2b7d70ccad3dbdbd267519810a.tar.zst
nixpkgs-694f07be2effcd2b7d70ccad3dbdbd267519810a.zip
Merge pull request #59871 from NixOS/update-calibre
calibre: 3.40.1 -> 3.41.3
-rw-r--r--pkgs/applications/misc/calibre/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 39b4dbe0fe5..b8e9b6b0666 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.40.1";
+  version = "3.41.3";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "1s1kq8axfymr7agg7dqw47kanlrkzzhsy8pcj1fs5644zjp5n0bq";
+    sha256 = "167hhv4wimkjnyfgqkyqmaiixhicbxacy6190gps98jyj4csi8ra";
   };
 
   patches = [
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   ] ++ (with python2Packages; [
     apsw cssselect css-parser dateutil dnspython html5-parser lxml mechanize netifaces pillow
     python pyqt5_with_qtwebkit sip
-    regex msgpack
+    regex msgpack beautifulsoup4
     # the following are distributed with calibre, but we use upstream instead
     odfpy
   ]);