pyrox.dev
calibre: 6.26.0 -> 6.28.1
https://github.com/kovidgoyal/calibre/releases/tag/v6.28.1
+3
-3
pkgs/applications/misc/calibre/default.nix
+3
-3
pkgs/applications/misc/calibre/default.nix
···
32
32
33
33
stdenv.mkDerivation (finalAttrs: {
34
34
pname = "calibre";
35
-
version = "6.26.0";
35
+
version = "6.28.1";
36
36
37
37
src = fetchurl {
38
38
url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
39
-
hash = "sha256-7UUnDtTRf162xKMUuZoKh+y47oeUtrOsFHUTAvtOryM=";
39
+
hash = "sha256-ZoJN8weAXUQkxalRtVtEaychc30+l2kfzG9Tm5jZh9g=";
40
40
};
41
41
42
42
patches = [
···
49
49
(fetchpatch {
50
50
name = "0007-Hardening-Qt-code.patch";
51
51
url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/hardening/0007-Hardening-Qt-code.patch";
52
-
hash = "sha256-2V8H6ElvzS5yw1di+XZvMssuokUT5zP3aTzpDpMsMac=";
52
+
hash = "sha256-eTzwo8aAIJnZTIZ/8DqCQi3ZbKxycEdiv+UxRuxo12g=";
53
53
})
54
54
]
55
55
++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
+6
-6
pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch
+6
-6
pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch
···
1
1
diff --git a/src/calibre/ebooks/metadata/archive.py b/src/calibre/ebooks/metadata/archive.py
2
-
index 938ab24..1e095f8 100644
2
+
index 50b4750124..858e39eece 100644
3
3
--- a/src/calibre/ebooks/metadata/archive.py
4
4
+++ b/src/calibre/ebooks/metadata/archive.py
5
-
@@ -44,7 +44,7 @@
5
+
@@ -99,7 +99,7 @@ class ArchiveExtract(FileTypePlugin):
6
6
description = _('Extract common e-book formats from archive files '
7
-
'(ZIP/RAR). Also try to autodetect if they are actually '
8
-
'CBZ/CBR files.')
9
-
- file_types = {'zip', 'rar'}
10
-
+ file_types = {'zip'}
7
+
'(ZIP/RAR/7z). Also try to autodetect if they are actually '
8
+
'CBZ/CBR/CB7 files.')
9
+
- file_types = {'zip', 'rar', '7z'}
10
+
+ file_types = {'zip', '7z'}
11
11
supported_platforms = ['windows', 'osx', 'linux']
12
12
on_import = True