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

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

Browse Source 
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
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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