Merge pull request #85528 from NixOS/revert-84370-update-calibre

Revert "calibre: 4.12.0 -> 4.13.0"
This commit is contained in:
worldofpeace 2020-04-18 20:52:04 -04:00 committed by GitHub
commit f578913905
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -16,7 +16,7 @@
, hyphen
, unrarSupport ? false
, chmlib
, python3Packages
, python2Packages
, libusb1
, libmtp
, xdg_utils
@ -25,15 +25,16 @@
}:
let
pypkgs = python3Packages;
pypkgs = python2Packages;
in
mkDerivation rec {
pname = "calibre";
version = "4.13.0";
version = "4.12.0";
src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
sha256 = "1xp1fvpdizk6g74diam4nd59s6fhcvp086y1brm6r9wy9zm7sn7r";
sha256 = "144vl5p0adcywcqaarrriq5zd8q5i934yfjg9himiq1vdp9vy4fi";
};
patches = [
@ -170,7 +171,8 @@ mkDerivation rec {
description = "Comprehensive e-book software";
homepage = "https://calibre-ebook.com";
license = with licenses; if unrarSupport then unfreeRedistributable else gpl3;
maintainers = with maintainers; [ domenkozar pSub ];
maintainers = with maintainers; [ domenkozar pSub AndersonTorres ];
platforms = platforms.linux;
inherit version;
};
}