Merge master into staging-next

2019-08-18 12:53:44 +02:00
parent b8a79ac677 ffbb4d26f9
commit f65aa21bb2
125 changed files with 3217 additions and 885 deletions
@@ -6,11 +6,11 @@

 mkDerivation rec {
  pname = "calibre";
-  version = "3.45.2";
+  version = "3.46.0";

  src = fetchurl {
    url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
-    sha256 = "1379g375s3h0fgv9qg43hrg16knd76ym7qkffpn1qyc7kkhv8a05";
+    sha256 = "1dlss01kaz2qlg9ji8c9dn9rd73mmpm5yjg50zp49cwx9y2vjiz9";
  };

  patches = [