public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

calibre: 4.23.0 -> 5.9.0

Browse Source 
Updates calibre version to 5.9.0 by pinning the Python version to 3.
Calibre upgraded to Python 3 since the 5.0 release.
Adds aliases for removed packages.

Fixes #106256.
This commit is contained in:
Hugo Lageneste 2021-01-12 08:21:35 +01:00
parent da3ee10b6b
commit bbe300a6b8
No known key found for this signature in database
GPG Key ID: F62897BB4BF7B96A
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/applications/misc/calibre/default.nix
View File

@ -16,7 +16,7 @@
, hyphen , hyphen
, unrarSupport ? false , unrarSupport ? false
, chmlib , chmlib
, pythonPackages , python3Packages
, libusb1 , libusb1
, libmtp , libmtp
, xdg_utils , xdg_utils
@ -26,11 +26,11 @@
mkDerivation rec { mkDerivation rec {
pname = "calibre"; pname = "calibre";
version = "4.23.0"; version = "5.9.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 = "sha256-Ft5RRzzw4zb5RqVyUaHk9Pu6H4V/F9j8FKoTLn61lRg="; sha256 = "a71196af15372054c4a25697534a2df1ef6dd732b9db07aaecaac7a86d9b3a0a";
}; };
patches = [ patches = [
@ -43,7 +43,7 @@ mkDerivation rec {
] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
prePatch = '' prePatch = ''
sed -i "/pyqt_sip_dir/ s:=.*:= '${pythonPackages.pyqt5}/share/sip/PyQt5':" \ sed -i "/pyqt_sip_dir/ s:=.*:= '${python3Packages.pyqt5}/share/sip/PyQt5':" \
setup/build_environment.py setup/build_environment.py
# Remove unneeded files and libs # Remove unneeded files and libs
@ -57,8 +57,6 @@ mkDerivation rec {
nativeBuildInputs = [ pkgconfig qmake removeReferencesTo ]; nativeBuildInputs = [ pkgconfig qmake removeReferencesTo ];
CALIBRE_PY3_PORT = builtins.toString pythonPackages.isPy3k;
buildInputs = [ buildInputs = [
chmlib chmlib
fontconfig fontconfig
@ -76,7 +74,7 @@ mkDerivation rec {
sqlite sqlite
xdg_utils xdg_utils
] ++ ( ] ++ (
with pythonPackages; [ with python3Packages; [
apsw apsw
beautifulsoup4 beautifulsoup4
css-parser css-parser
@ -114,11 +112,11 @@ 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=${pythonPackages.sip}/bin/sip export SIP_BIN=${python3Packages.sip}/bin/sip
export XDG_DATA_HOME=$out/share export XDG_DATA_HOME=$out/share
export XDG_UTILS_INSTALL_MODE="user" export XDG_UTILS_INSTALL_MODE="user"
${pythonPackages.python.interpreter} setup.py install --root=$out \ ${python3Packages.python.interpreter} setup.py install --root=$out \
--prefix=$out \ --prefix=$out \
--libdir=$out/lib \ --libdir=$out/lib \
--staging-root=$out \ --staging-root=$out \
@ -147,7 +145,7 @@ mkDerivation rec {
# /nix/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-podofo-0.9.6-dev/include/podofo/base/PdfVariant.h # /nix/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-podofo-0.9.6-dev/include/podofo/base/PdfVariant.h
preFixup = '' preFixup = ''
remove-references-to -t ${podofo.dev} \ remove-references-to -t ${podofo.dev} \
$out/lib/calibre/calibre/plugins${lib.optionalString pythonPackages.isPy3k "/3"}/podofo.so $out/lib/calibre/calibre/plugins${lib.optionalString python3Packages.isPy3k "/3"}/podofo.so
for program in $out/bin/*; do for program in $out/bin/*; do
wrapProgram $program \ wrapProgram $program \

2
pkgs/top-level/aliases.nix
View File

@ -84,6 +84,8 @@ mapAliases ({
buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26 buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26
bundler_HEAD = bundler; # added 2015-11-15 bundler_HEAD = bundler; # added 2015-11-15
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 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
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-12
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-12
cantarell_fonts = cantarell-fonts; # added 2018-03-03 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 cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead."; # added 2020-08-20
casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken."; casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken.";

6
pkgs/top-level/all-packages.nix
View File

@ -20753,11 +20753,7 @@ in
calculix = callPackage ../applications/science/math/calculix {}; calculix = callPackage ../applications/science/math/calculix {};
calibre-py2 = libsForQt5.callPackage ../applications/misc/calibre { pythonPackages = python2Packages; }; calibre = libsForQt5.callPackage ../applications/misc/calibre {};
calibre-py3 = libsForQt5.callPackage ../applications/misc/calibre { pythonPackages = python3Packages; };
calibre = calibre-py3;
calligra = libsForQt5.callPackage ../applications/office/calligra { calligra = libsForQt5.callPackage ../applications/office/calligra {
openjpeg = openjpeg_1; openjpeg = openjpeg_1;