Merge pull request #131477 from yaymukund/calibre-zeroconf

This commit is contained in:
Sandro 2021-07-27 08:05:30 +00:00 committed by GitHub
commit d82543f22d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,6 +1,7 @@
{ lib { lib
, mkDerivation , mkDerivation
, fetchurl , fetchurl
, fetchFromGitHub
, poppler_utils , poppler_utils
, pkg-config , pkg-config
, libpng , libpng
@ -94,7 +95,15 @@ mkDerivation rec {
python python
regex regex
sip 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 # the following are distributed with calibre, but we use upstream instead
odfpy odfpy
] ++ lib.optional (unrarSupport) unrardll ] ++ lib.optional (unrarSupport) unrardll