BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

calibre: 3.47.1 -> 3.48.0

Browse source
This commit is contained in:
Peter Hoeg 2019-09-28 20:47:41 +08:00 committed by Lassulus
parent 4de18778a3
commit e93d04597d
1 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
pkgs/applications/misc/calibre/default.nix
View file

@ -1,16 +1,20 @@
{ stdenv, mkDerivation, fetchurl, poppler_utils, pkgconfig, libpng { lib, mkDerivation, fetchurl, poppler_utils, pkgconfig, libpng
, imagemagick, libjpeg, fontconfig, podofo, qtbase, qmake, icu, sqlite , imagemagick, libjpeg, fontconfig, podofo, qtbase, qmake, icu, sqlite
, unrarSupport ? false, chmlib, python2Packages, libusb1, libmtp , unrarSupport ? false, chmlib, python2Packages, libusb1, libmtp
, xdg_utils, makeDesktopItem, wrapGAppsHook, removeReferencesTo, qt5 , xdg_utils, makeDesktopItem, removeReferencesTo
}: }:
let
pypkgs = python2Packages;
in
mkDerivation rec { mkDerivation rec {
pname = "calibre"; pname = "calibre";
version = "3.47.1"; version = "3.48.0";
src = fetchurl { src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
sha256 = "17lz6rawlv268vv8i5kj59rswsipq3c14066adaz1paw54zr62dk"; sha256 = "034m89h7j2088p324i1kya33dfldmqyynjxk3w98xiqkz7q2hi82";
}; };
patches = [ patches = [
@ -20,10 +24,10 @@ mkDerivation rec {
# - switches the version update from enabled to disabled by default # - switches the version update from enabled to disabled by default
./no_updates_dialog.patch ./no_updates_dialog.patch
# the unrar patch is not from debian # the unrar patch is not from debian
] ++ stdenv.lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
prePatch = '' prePatch = ''
sed -i "/pyqt_sip_dir/ s:=.*:= '${python2Packages.pyqt5_with_qtwebkit}/share/sip/PyQt5':" \ sed -i "/pyqt_sip_dir/ s:=.*:= '${pypkgs.pyqt5_with_qtwebkit}/share/sip/PyQt5':" \
setup/build_environment.py setup/build_environment.py
# Remove unneeded files and libs # Remove unneeded files and libs
@ -35,17 +39,21 @@ mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig qmake removeReferencesTo wrapGAppsHook ]; nativeBuildInputs = [ pkgconfig qmake removeReferencesTo ];
CALIBRE_PY3_PORT = builtins.toString pypkgs.isPy3k;
buildInputs = [ buildInputs = [
poppler_utils libpng imagemagick libjpeg poppler_utils libpng imagemagick libjpeg
fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils
] ++ (with python2Packages; [ ] ++ (with pypkgs; [
apsw cssselect css-parser dateutil dnspython html5-parser lxml mechanize netifaces pillow apsw cssselect css-parser dateutil dnspython html5-parser lxml netifaces pillow
python pyqt5_with_qtwebkit sip python pyqt5_with_qtwebkit sip
regex msgpack beautifulsoup4 regex msgpack beautifulsoup4 html2text
# 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.optionals (!pypkgs.isPy3k) (with pypkgs; [
mechanize
]); ]);
installPhase = '' installPhase = ''
@ -60,8 +68,8 @@ mkDerivation rec {
export FC_LIB_DIR=${fontconfig.lib}/lib export FC_LIB_DIR=${fontconfig.lib}/lib
export PODOFO_INC_DIR=${podofo.dev}/include/podofo export PODOFO_INC_DIR=${podofo.dev}/include/podofo
export PODOFO_LIB_DIR=${podofo.lib}/lib export PODOFO_LIB_DIR=${podofo.lib}/lib
export SIP_BIN=${python2Packages.sip}/bin/sip export SIP_BIN=${pypkgs.sip}/bin/sip
${python2Packages.python.interpreter} setup.py install --prefix=$out ${pypkgs.python.interpreter} setup.py install --prefix=$out
PYFILES="$out/bin/* $out/lib/calibre/calibre/web/feeds/*.py PYFILES="$out/bin/* $out/lib/calibre/calibre/web/feeds/*.py
$out/lib/calibre/calibre/ebooks/metadata/*.py $out/lib/calibre/calibre/ebooks/metadata/*.py
@ -111,7 +119,7 @@ mkDerivation rec {
genericName = "E-book library management"; genericName = "E-book library management";
icon = "@out@/share/calibre/images/library.png"; icon = "@out@/share/calibre/images/library.png";
comment = "Manage, convert, edit, and read e-books"; comment = "Manage, convert, edit, and read e-books";
mimeType = stdenv.lib.concatStringsSep ";" [ mimeType = lib.concatStringsSep ";" [
"application/x-mobipocket-subscription" "application/x-mobipocket-subscription"
"application/vnd.openxmlformats-officedocument.wordprocessingml.document" "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
"text/html" "text/html"
@ -174,9 +182,9 @@ mkDerivation rec {
extraEntries = "NoDisplay=true"; extraEntries = "NoDisplay=true";
}; };
meta = with stdenv.lib; { meta = with lib; {
description = "Comprehensive e-book software"; description = "Comprehensive e-book software";
homepage = https://calibre-ebook.com; homepage = "https://calibre-ebook.com";
license = with licenses; if unrarSupport then unfreeRedistributable else gpl3; license = with licenses; if unrarSupport then unfreeRedistributable else gpl3;
maintainers = with maintainers; [ domenkozar pSub AndersonTorres ]; maintainers = with maintainers; [ domenkozar pSub AndersonTorres ];
platforms = platforms.linux; platforms = platforms.linux;