public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #22933 from peterhoeg/u/cal 

calibre: 2.76.0 -> 2.79.1
This commit is contained in:
Peter Hoeg 2017-02-18 16:58:14 +08:00 committed by GitHub
parent 70cadb6cbd 43dbd916ef
commit a3410e2912
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/calibre/default.nix
View File

@ -5,12 +5,12 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.76.0"; version = "2.79.1";
name = "calibre-${version}"; name = "calibre-${version}";
src = fetchurl { src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
sha256 = "1xfm586n6gm44mkyn25mbiyhj6w9ji9yl6fvmnr4zk1q6qcga3v8"; sha256 = "0slk3cili50a8kwwsk6syqqrcz0yx8yjvhm8gyggn2k2kpqjax15";
}; };
patches = [ patches = [

27
pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch
View File

@ -1,13 +1,8 @@
Author: Dmitry Shachnev <mitya57@gmail.com> diff --git a/setup/extensions.json b/setup/extensions.json
Description: do not build unrar extension as we strip unrar from the tarball index 1f6d1fb..1273904 100644
Forwarded: not-needed --- a/setup/extensions.json
Last-Update: 2013-04-04 +++ b/setup/extensions.json
@@ -211,16 +211,5 @@
Index: calibre/setup/extensions.json
===================================================================
--- calibre.orig/setup/extensions.json
+++ calibre/setup/extensions.json
@@ -211,14 +211,5 @@
"sources": "calibre/devices/mtp/unix/devices.c calibre/devices/mtp/unix/libmtp.c", "sources": "calibre/devices/mtp/unix/devices.c calibre/devices/mtp/unix/libmtp.c",
"headers": "calibre/devices/mtp/unix/devices.h calibre/devices/mtp/unix/upstream/music-players.h calibre/devices/mtp/unix/upstream/device-flags.h", "headers": "calibre/devices/mtp/unix/devices.h calibre/devices/mtp/unix/upstream/music-players.h calibre/devices/mtp/unix/upstream/device-flags.h",
"libraries": "mtp" "libraries": "mtp"
@ -18,15 +13,17 @@ Index: calibre/setup/extensions.json
- "inc_dirs": "unrar", - "inc_dirs": "unrar",
- "defines": "SILENT RARDLL UNRAR _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE", - "defines": "SILENT RARDLL UNRAR _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE",
- "windows_defines": "SILENT RARDLL UNRAR", - "windows_defines": "SILENT RARDLL UNRAR",
- "haiku_defines": "LITTLE_ENDIAN SILENT RARDLL UNRAR _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE _BSD_SOURCE",
- "haiku_libraries": "bsd",
- "optimize_level": 2, - "optimize_level": 2,
- "windows_libraries": "User32 Advapi32 kernel32 Shell32" - "windows_libraries": "User32 Advapi32 kernel32 Shell32"
} }
] ]
Index: calibre/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
--- calibre.orig/src/calibre/ebooks/metadata/archive.py 2014-02-02 10:42:14.510954007 +0100 --- a/src/calibre/ebooks/metadata/archive.py
+++ calibre/src/calibre/ebooks/metadata/archive.py 2014-02-02 10:42:14.502954007 +0100 +++ b/src/calibre/ebooks/metadata/archive.py
@@ -42,7 +42,7 @@ @@ -44,7 +44,7 @@ class ArchiveExtract(FileTypePlugin):
description = _('Extract common e-book formats from archives ' description = _('Extract common e-book formats from archives '
'(zip/rar) files. Also try to autodetect if they are actually ' '(zip/rar) files. Also try to autodetect if they are actually '
'cbz/cbr files.') 'cbz/cbr files.')