swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-22 05:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #257233 from kilianar/calibre-6.27.0

Browse source 
calibre: 6.26.0 -> 6.28.1
This commit is contained in:
Mario Rodas 2023-10-11 18:15:55 -05:00 committed by GitHub
parent 78644c9d5d 71c4ac9a82
commit fcd03f4cf7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/misc/calibre/default.nix
View file

@ -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;

12
pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch
View file

@ -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