calibre: 6.26.0 -> 6.28.1
https://github.com/kovidgoyal/calibre/releases/tag/v6.28.1
This commit is contained in:
parent
147d12908d
commit
71c4ac9a82
2 changed files with 9 additions and 9 deletions
|
@ -32,11 +32,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "calibre";
|
pname = "calibre";
|
||||||
version = "6.26.0";
|
version = "6.28.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
|
url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
|
||||||
hash = "sha256-7UUnDtTRf162xKMUuZoKh+y47oeUtrOsFHUTAvtOryM=";
|
hash = "sha256-ZoJN8weAXUQkxalRtVtEaychc30+l2kfzG9Tm5jZh9g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
name = "0007-Hardening-Qt-code.patch";
|
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";
|
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;
|
++ lib.optional (!unrarSupport) ./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
|
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
|
--- a/src/calibre/ebooks/metadata/archive.py
|
||||||
+++ b/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 '
|
description = _('Extract common e-book formats from archive files '
|
||||||
'(ZIP/RAR). Also try to autodetect if they are actually '
|
'(ZIP/RAR/7z). Also try to autodetect if they are actually '
|
||||||
'CBZ/CBR files.')
|
'CBZ/CBR/CB7 files.')
|
||||||
- file_types = {'zip', 'rar'}
|
- file_types = {'zip', 'rar', '7z'}
|
||||||
+ file_types = {'zip'}
|
+ file_types = {'zip', '7z'}
|
||||||
supported_platforms = ['windows', 'osx', 'linux']
|
supported_platforms = ['windows', 'osx', 'linux']
|
||||||
on_import = True
|
on_import = True
|
||||||
|
|
Loading…
Reference in a new issue