Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8fb62abe8af0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7966f10400f1
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 13, 2020

  1. calibre: 3.48 -> 4.8

    @peterhoeg
    peterhoeg committed Jan 13, 2020
    Copy the full SHA
    f005f2d View commit details

Commits on Jan 18, 2020

  1. Merge pull request #77616 from peterhoeg/u/calibre_4_8 

    calibre: 3.48 -> 4.8
    @nh2
    nh2 authored Jan 18, 2020
    Copy the full SHA
    7966f10 View commit details
Showing with 69 additions and 17 deletions.
  1. +69 −17 pkgs/applications/misc/calibre/default.nix
86 changes: 69 additions & 17 deletions pkgs/applications/misc/calibre/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,27 @@
{ lib, mkDerivation, fetchurl, poppler_utils, pkgconfig, libpng
, imagemagick, libjpeg, fontconfig, podofo, qtbase, qmake, icu, sqlite
, unrarSupport ? false, chmlib, python2Packages, libusb1, libmtp
, xdg_utils, makeDesktopItem, removeReferencesTo
{ lib
, mkDerivation
, fetchurl
, poppler_utils
, pkgconfig
, libpng
, imagemagick
, libjpeg
, fontconfig
, podofo
, qtbase
, qmake
, icu
, sqlite
, hunspell
, hyphen
, unrarSupport ? false
, chmlib
, python2Packages
, libusb1
, libmtp
, xdg_utils
, makeDesktopItem
, removeReferencesTo
}:

let
@@ -10,11 +30,11 @@ let
in
mkDerivation rec {
pname = "calibre";
version = "3.48.0";
version = "4.8.0";

src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
sha256 = "034m89h7j2088p324i1kya33dfldmqyynjxk3w98xiqkz7q2hi82";
sha256 = "1lk44qh3hzqhpz2b00iik7cgjg4xm36qjh2pxflkjnbk691gbpqk";
};

patches = [
@@ -44,17 +64,49 @@ mkDerivation rec {
CALIBRE_PY3_PORT = builtins.toString pypkgs.isPy3k;

buildInputs = [
poppler_utils libpng imagemagick libjpeg
fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils
] ++ (with pypkgs; [
apsw cssselect css-parser dateutil dnspython feedparser html5-parser lxml markdown netifaces pillow
python pyqt5_with_qtwebkit sip
regex msgpack beautifulsoup4 html2text
# the following are distributed with calibre, but we use upstream instead
odfpy
]) ++ lib.optionals (!pypkgs.isPy3k) (with pypkgs; [
mechanize
]);
poppler_utils
libpng
imagemagick
libjpeg
fontconfig
podofo
qtbase
chmlib
icu
hunspell
hyphen
sqlite
libusb1
libmtp
xdg_utils
] ++ (
with pypkgs; [
apsw
cssselect
css-parser
dateutil
dnspython
feedparser
html5-parser
lxml
markdown
netifaces
pillow
python
pyqt5_with_qtwebkit
sip
regex
msgpack
beautifulsoup4
html2text
# the following are distributed with calibre, but we use upstream instead
odfpy
]
) ++ lib.optionals (!pypkgs.isPy3k) (
with pypkgs; [
mechanize
]
);

installPhase = ''
runHook preInstall