From 35ce59b03b0f3a93805952968245fd122b314f16 Mon Sep 17 00:00:00 2001 From: Mukund Lakshman Date: Sun, 25 Jul 2021 14:08:30 +0100 Subject: [PATCH] calibre: Pin zeroconf dependency to 0.31 This prevents https://bugs.launchpad.net/calibre/+bug/1936889 which has been patched [1] in calibre master but not yet released. [1]: https://github.com/kovidgoyal/calibre/commit/4f9e83e6426483b6cc0929c61f9207c33c573fec --- pkgs/applications/misc/calibre/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index d27c9c9af65..07e0a62b901 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,6 +1,7 @@ { lib , mkDerivation , fetchurl +, fetchFromGitHub , poppler_utils , pkg-config , libpng @@ -94,7 +95,15 @@ mkDerivation rec { python regex sip - zeroconf + (zeroconf.overrideAttrs (oldAttrs: rec { + version = "0.31.0"; + src = fetchFromGitHub { + owner = "jstasiak"; + repo = "python-zeroconf"; + rev = version; + sha256 = "158dqay74zvnz6kmpvip4ml0kw59nf2aaajwgaamx0zc8ci1p5pj"; + }; + })) # the following are distributed with calibre, but we use upstream instead odfpy ] ++ lib.optional (unrarSupport) unrardll