nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-25 17:55:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

calibre: 9.11.0 -> 9.13.0

Browse Source 
(cherry picked from commit 8200b7851b)
This commit is contained in:
Vegard Bieker Matthey
2026-08-04 15:56:50 +02:00
committed by github-actions[bot]
parent 86038378b4
commit a43feb110f
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/by-name/ca/calibre/dont_build_unrar_plugin.patch
View File

@@ -1,12 +1,13 @@
diff --git a/src/calibre/ebooks/metadata/archive.py b/src/calibre/ebooks/metadata/archive.py
index 50b4750124..858e39eece 100644
index 83a549d3b6..a4c5fe5ce5 100644
--- a/src/calibre/ebooks/metadata/archive.py
+++ b/src/calibre/ebooks/metadata/archive.py
@@ -99,7 +99,7 @@ class ArchiveExtract(FileTypePlugin):
description = _('Extract common e-book formats from archive files '
'(ZIP/RAR/7z). Also try to autodetect if they are actually '
'CBZ/CBR/CB7 files.')
@@ -127,7 +127,7 @@ class ArchiveExtract(FileTypePlugin):
name = 'Archive Extract'
author = 'Kovid Goyal'
description = _('Extract common e-book formats from archive files (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

9
pkgs/by-name/ca/calibre/package.nix
View File

@@ -40,11 +40,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "calibre";
version = "9.11.0";
version = "9.13.0";
src = fetchurl {
url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
hash = "sha256-UNQuOzLsURb2sd8JlTf0vsrza/7ez59YG3Q/Edi2yzY=";
hash = "sha256-ONfYjXq8vGLG/jV1SD+1STzpYtJhqXihpNtNWLxLN5M=";
};
patches =
@@ -57,12 +57,12 @@ stdenv.mkDerivation (finalAttrs: {
(fetchpatch {
name = "0001-only-plugin-update-${debian-tag}.patch";
url = "https://github.com/debian-calibre/calibre/raw/refs/tags/debian/${debian-tag}/debian/patches/0001-only-plugin-update.patch";
hash = "sha256-/Hz8DSL1VC/wwQPOssM54MInLidfo7kJoR69yi2wAP4=";
hash = "sha256-2QhNf9CBxvoMiK9ZqBWnA/zdcIYpY+HGG0uguUZbinw=";
})
(fetchpatch {
name = "0007-Hardening-Qt-code-${debian-tag}.patch";
url = "https://github.com/debian-calibre/calibre/raw/refs/tags/debian/${debian-tag}/debian/patches/hardening/0007-Hardening-Qt-code.patch";
hash = "sha256-/xXkxFJNRnjH8RmXcotrPI6rZ+I1ENjikl1eLU0NEjQ=";
hash = "sha256-ItJalYmBhK4Qgz6QDGbPpBMaa6oGQetQvg5ie3oxFMM=";
})
]
++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
@@ -123,6 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
dnspython
faust-cchardet
feedparser
feedparser-sgmllib
html2text
html5-parser
lxml