Merge pull request #52822 from ivan/calibre-3.36.0

calibre: 3.31.0 -> 3.36.0
This commit is contained in:
Yannis Koutras 2018-12-26 10:30:41 +02:00 committed by GitHub
commit ebf55b6f1f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View file

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

View file

@ -6,7 +6,7 @@ index 938ab24..1e095f8 100644
description = _('Extract common e-book formats from archive files '
'(ZIP/RAR). Also try to autodetect if they are actually '
'CBZ/CBR files.')
- file_types = set(['zip', 'rar'])
+ file_types = set(['zip'])
- file_types = {'zip', 'rar'}
+ file_types = {'zip'}
supported_platforms = ['windows', 'osx', 'linux']
on_import = True