Merge pull request #77616 from peterhoeg/u/calibre_4_8

calibre: 3.48 -> 4.8

pkgs/applications/misc/calibre/default.nix

@@ -1,7 +1,27 @@
-{ lib, mkDerivation, fetchurl, poppler_utils, pkgconfig, libpng
+{ lib
-, imagemagick, libjpeg, fontconfig, podofo, qtbase, qmake, icu, sqlite
+, mkDerivation
-, unrarSupport ? false, chmlib, python2Packages, libusb1, libmtp
+, fetchurl
-, xdg_utils, makeDesktopItem, removeReferencesTo
+, poppler_utils
+, pkgconfig
+, libpng
+, imagemagick
+, libjpeg
+, fontconfig
+, podofo
+, qtbase
+, qmake
+, icu
+, sqlite
+, hunspell
+, hyphen
+, unrarSupport ? false
+, chmlib
+, python2Packages
+, libusb1
+, libmtp
+, xdg_utils
+, makeDesktopItem
+, removeReferencesTo
 }:
 
 let
@@ -10,11 +30,11 @@ let
 in
 mkDerivation rec {
   pname = "calibre";
-  version = "3.48.0";
+  version = "4.8.0";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
-    sha256 = "034m89h7j2088p324i1kya33dfldmqyynjxk3w98xiqkz7q2hi82";
+    sha256 = "1lk44qh3hzqhpz2b00iik7cgjg4xm36qjh2pxflkjnbk691gbpqk";
   };
 
   patches = [
@@ -44,17 +64,49 @@ mkDerivation rec {
   CALIBRE_PY3_PORT = builtins.toString pypkgs.isPy3k;
 
   buildInputs = [
-    poppler_utils libpng imagemagick libjpeg
+    poppler_utils
-    fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils
+    libpng
-  ] ++ (with pypkgs; [
+    imagemagick
-    apsw cssselect css-parser dateutil dnspython feedparser html5-parser lxml markdown netifaces pillow
+    libjpeg
-    python pyqt5_with_qtwebkit sip
+    fontconfig
-    regex msgpack beautifulsoup4 html2text
+    podofo
-    # the following are distributed with calibre, but we use upstream instead
+    qtbase
-    odfpy
+    chmlib
-  ]) ++ lib.optionals (!pypkgs.isPy3k) (with pypkgs; [
+    icu
-    mechanize
+    hunspell
-  ]);
+    hyphen
+    sqlite
+    libusb1
+    libmtp
+    xdg_utils
+  ] ++ (
+    with pypkgs; [
+      apsw
+      cssselect
+      css-parser
+      dateutil
+      dnspython
+      feedparser
+      html5-parser
+      lxml
+      markdown
+      netifaces
+      pillow
+      python
+      pyqt5_with_qtwebkit
+      sip
+      regex
+      msgpack
+      beautifulsoup4
+      html2text
+      # the following are distributed with calibre, but we use upstream instead
+      odfpy
+    ]
+  ) ++ lib.optionals (!pypkgs.isPy3k) (
+    with pypkgs; [
+      mechanize
+    ]
+  );
 
   installPhase = ''
     runHook preInstall