mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-31 09:14:28 +00:00
Merge pull request #268545 from kilianar/calibre-7.0.0
calibre: 6.29.0 -> 7.0.0
This commit is contained in:
commit
b56dc6becd
@ -32,11 +32,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "calibre";
|
||||
version = "6.29.0";
|
||||
version = "7.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-w9mvMKm76w5sDfW0OYxhZuhIOYKdUH3tpiGlpKNC2kM=";
|
||||
hash = "sha256-VAnzacz/8LYCVMCjHXqd4B+NUFmiMqdxQqpyap+UMNc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -123,6 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
zeroconf
|
||||
jeepney
|
||||
pycryptodome
|
||||
xxhash
|
||||
# the following are distributed with calibre, but we use upstream instead
|
||||
odfpy
|
||||
] ++ lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqt6-webengine.meta.platforms) [
|
||||
|
Loading…
Reference in New Issue
Block a user