Unverified Commit b56dc6be authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #268545 from kilianar/calibre-7.0.0 

calibre: 6.29.0 -> 7.0.0
parents d6671b3d 0c82a228

pkgs/applications/misc/calibre/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -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) [