calibre: 4.23.0 -> 5.10.1

Co-authored-by: ento <ento+github@i.pearlwaffles.xyz>
Co-authored-by: Eduardo Sánchez Muñoz <esm@eduardosm.net>
This commit is contained in:
Eduardo Sánchez Muñoz 2021-01-13 21:39:14 +01:00
parent 36945fedef
commit a2807e67f0
3 changed files with 27 additions and 17 deletions

View File

@ -1,4 +1,5 @@
{ lib
, stdenv
, mkDerivation
, fetchurl
, poppler_utils
@ -16,7 +17,7 @@
, hyphen
, unrarSupport ? false
, chmlib
, pythonPackages
, python3Packages
, libusb1
, libmtp
, xdg_utils
@ -26,11 +27,11 @@
mkDerivation rec {
pname = "calibre";
version = "4.23.0";
version = "5.10.1";
src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-Ft5RRzzw4zb5RqVyUaHk9Pu6H4V/F9j8FKoTLn61lRg=";
sha256 = "18pnqxdyvgmw12yarxhvsgs4jk6c5hp05gf8khybcd78330954v9";
};
patches = [
@ -42,9 +43,20 @@ mkDerivation rec {
# the unrar patch is not from debian
] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
escaped_pyqt5_dir = builtins.replaceStrings ["/"] ["\\/"] (toString python3Packages.pyqt5);
platform_tag =
if stdenv.hostPlatform.isDarwin then
"WS_MACX"
else if stdenv.hostPlatform.isWindows then
"WS_WIN"
else
"WS_X11";
prePatch = ''
sed -i "/pyqt_sip_dir/ s:=.*:= '${pythonPackages.pyqt5}/share/sip/PyQt5':" \
setup/build_environment.py
sed -i "s/\[tool.sip.project\]/[tool.sip.project]\nsip-include-dirs = [\"${escaped_pyqt5_dir}\/share\/sip\/PyQt5\"]/g" \
setup/build.py
sed -i "s/\[tool.sip.bindings.pictureflow\]/[tool.sip.bindings.pictureflow]\ntags = [\"${platform_tag}\"]/g" \
setup/build.py
# Remove unneeded files and libs
rm -rf resources/calibre-portable.* \
@ -57,8 +69,6 @@ mkDerivation rec {
nativeBuildInputs = [ pkg-config qmake removeReferencesTo ];
CALIBRE_PY3_PORT = builtins.toString pythonPackages.isPy3k;
buildInputs = [
chmlib
fontconfig
@ -76,7 +86,7 @@ mkDerivation rec {
sqlite
xdg_utils
] ++ (
with pythonPackages; [
with python3Packages; [
apsw
beautifulsoup4
css-parser
@ -92,11 +102,13 @@ mkDerivation rec {
msgpack
netifaces
pillow
pyqt-builder
pyqt5
pyqtwebengine
python
regex
sip
sip_5
zeroconf
# the following are distributed with calibre, but we use upstream instead
odfpy
] ++ lib.optional (unrarSupport) unrardll
@ -114,11 +126,11 @@ mkDerivation rec {
export FC_LIB_DIR=${fontconfig.lib}/lib
export PODOFO_INC_DIR=${podofo.dev}/include/podofo
export PODOFO_LIB_DIR=${podofo.lib}/lib
export SIP_BIN=${pythonPackages.sip}/bin/sip
export SIP_BIN=${python3Packages.sip}/bin/sip
export XDG_DATA_HOME=$out/share
export XDG_UTILS_INSTALL_MODE="user"
${pythonPackages.python.interpreter} setup.py install --root=$out \
${python3Packages.python.interpreter} setup.py install --root=$out \
--prefix=$out \
--libdir=$out/lib \
--staging-root=$out \
@ -147,7 +159,7 @@ mkDerivation rec {
# /nix/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-podofo-0.9.6-dev/include/podofo/base/PdfVariant.h
preFixup = ''
remove-references-to -t ${podofo.dev} \
$out/lib/calibre/calibre/plugins${lib.optionalString pythonPackages.isPy3k "/3"}/podofo.so
$out/lib/calibre/calibre/plugins/podofo.so
for program in $out/bin/*; do
wrapProgram $program \

View File

@ -85,6 +85,8 @@ mapAliases ({
buildGo112Package = throw "buildGo112Package has been removed"; # added 2020-04-26
buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26
bundler_HEAD = bundler; # added 2015-11-15
calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement."; # added 2021-01-13
calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement."; # added 2021-01-13
caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # added 2020-10-02
cantarell_fonts = cantarell-fonts; # added 2018-03-03
cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead."; # added 2020-08-20

View File

@ -21220,11 +21220,7 @@ in
calculix = callPackage ../applications/science/math/calculix {};
calibre-py2 = libsForQt5.callPackage ../applications/misc/calibre { pythonPackages = python2Packages; };
calibre-py3 = libsForQt5.callPackage ../applications/misc/calibre { pythonPackages = python3Packages; };
calibre = calibre-py3;
calibre = libsForQt5.callPackage ../applications/misc/calibre { };
calligra = libsForQt5.callPackage ../applications/office/calligra {
# Must use the same Qt version as Calligra itself: