From 8dc93ec7ee79264f1b35a1aef5df1f3e3bbe9da0 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Tue, 25 Dec 2018 09:06:45 +0000
Subject: [PATCH] calibre: 3.31.0 -> 3.36.0
---
pkgs/applications/misc/calibre/default.nix | 4 ++--
pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 3554c36f519..6da1cdefa70 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
}:
stdenv.mkDerivation rec {
- version = "3.31.0";
+ version = "3.36.0";
name = "calibre-${version}";
src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
- sha256 = "1xg1bx0klvrywqry5rhci37fr7shpvb2wbx4bva20vhqkal169rw";
+ sha256 = "0fbf4b29vkka3gg8c5n9dc7qhv43jpw6naz6w83jkz7andypikb8";
};
patches = [
diff --git a/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch b/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch
index 45e27984ed5..5164b80a0be 100644
--- a/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch
+++ b/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch
@@ -6,7 +6,7 @@ index 938ab24..1e095f8 100644
description = _('Extract common e-book formats from archive files '
'(ZIP/RAR). Also try to autodetect if they are actually '
'CBZ/CBR files.')
-- file_types = set(['zip', 'rar'])
-+ file_types = set(['zip'])
+- file_types = {'zip', 'rar'}
++ file_types = {'zip'}
supported_platforms = ['windows', 'osx', 'linux']
on_import = True