From 7b8bd18a3071e11c951b69ab518c94ba0161c3f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Mon, 19 Apr 2021 13:22:41 +0200 Subject: [PATCH 1/2] calibre: 5.13.0 -> 5.16.1 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index f7e98462041..5f0739b1d9c 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -26,11 +26,11 @@ mkDerivation rec { pname = "calibre"; - version = "5.13.0"; + version = "5.16.1"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-GDFAZxZmkio7e7kVjhYqhNdhXIlUPJF0iMWVl0uWVCM="; + hash = "sha256-lTXCW0MGNOezecaGO9c2JGU4ylwpPmBaMXTY3nLNcrE="; }; patches = [ From fc191f27fc75d52d0ae496c634135248fb9a151a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Mon, 19 Apr 2021 18:41:26 +0200 Subject: [PATCH 2/2] calibre: remove `enableParallelBuilding = true` It is enabled by default. --- pkgs/applications/misc/calibre/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 5f0739b1d9c..11667ea3950 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -62,8 +62,6 @@ mkDerivation rec { dontUseQmakeConfigure = true; - enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config qmake removeReferencesTo ]; buildInputs = [