From 71c4ac9a8252dae795925c491e89389a34054264 Mon Sep 17 00:00:00 2001 From: kilianar Date: Mon, 25 Sep 2023 11:15:54 +0200 Subject: [PATCH] calibre: 6.26.0 -> 6.28.1 https://github.com/kovidgoyal/calibre/releases/tag/v6.28.1 --- pkgs/applications/misc/calibre/default.nix | 6 +++--- .../misc/calibre/dont_build_unrar_plugin.patch | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index a71984dd2c40..0c71b642fa2c 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "6.26.0"; + version = "6.28.1"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-7UUnDtTRf162xKMUuZoKh+y47oeUtrOsFHUTAvtOryM="; + hash = "sha256-ZoJN8weAXUQkxalRtVtEaychc30+l2kfzG9Tm5jZh9g="; }; patches = [ @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { (fetchpatch { name = "0007-Hardening-Qt-code.patch"; url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/hardening/0007-Hardening-Qt-code.patch"; - hash = "sha256-2V8H6ElvzS5yw1di+XZvMssuokUT5zP3aTzpDpMsMac="; + hash = "sha256-eTzwo8aAIJnZTIZ/8DqCQi3ZbKxycEdiv+UxRuxo12g="; }) ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; diff --git a/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch b/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch index 5164b80a0bee..e88e7374431c 100644 --- a/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch +++ b/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch @@ -1,12 +1,12 @@ diff --git a/src/calibre/ebooks/metadata/archive.py b/src/calibre/ebooks/metadata/archive.py -index 938ab24..1e095f8 100644 +index 50b4750124..858e39eece 100644 --- a/src/calibre/ebooks/metadata/archive.py +++ b/src/calibre/ebooks/metadata/archive.py -@@ -44,7 +44,7 @@ +@@ -99,7 +99,7 @@ class ArchiveExtract(FileTypePlugin): description = _('Extract common e-book formats from archive files ' - '(ZIP/RAR). Also try to autodetect if they are actually ' - 'CBZ/CBR files.') -- file_types = {'zip', 'rar'} -+ file_types = {'zip'} + '(ZIP/RAR/7z). Also try to autodetect if they are actually ' + 'CBZ/CBR/CB7 files.') +- file_types = {'zip', 'rar', '7z'} ++ file_types = {'zip', '7z'} supported_platforms = ['windows', 'osx', 'linux'] on_import = True