diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-12-31 09:47:26 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-12-31 09:53:02 +0100 |
| commit | f9f6f41bff2213e199bded515e9b66d1e5c4d7dd (patch) | |
| tree | 29c5a75228e31f305f42c5b761709a186e406776 /pkgs/applications/misc/calibre | |
| parent | bbcf127c7c9029cba43493d7d25a9d1c65d59152 (diff) | |
| parent | 468f698f609e123bb0ffae67181d07ac99eb2204 (diff) | |
| download | nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.gz nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.bz2 nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.lz nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.xz nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.zst nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.zip | |
Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5 on master, and I'm deferring pointing to correct outputs to later.
Diffstat (limited to 'pkgs/applications/misc/calibre')
| -rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index de5e4f26534f..46b09609d0bf 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, python, pyqt5, sip_4_16, poppler_utils, pkgconfig, libpng -, imagemagick, libjpeg, fontconfig, podofo, qt5, icu, sqlite +, imagemagick, libjpeg, fontconfig, podofo, qtbase, icu, sqlite , makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp , xdg_utils }: stdenv.mkDerivation rec { - version = "2.45.0"; + version = "2.46.0"; name = "calibre-${version}"; src = fetchurl { url = "http://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "1s3wrrvp2d0mczs09g2xkkknvlk3max6ws7awpss5kkdpjvay6ma"; + sha256 = "0ig1pb62w57l6nhwg391mkjhw9dyicix6xigpdyw0320jdw9nlkb"; }; inherit python; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ python pyqt5 sip_4_16 poppler_utils libpng imagemagick libjpeg - fontconfig podofo qt5.base chmlib icu sqlite libusb1 libmtp xdg_utils + fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow pythonPackages.sqlite3 pythonPackages.netifaces pythonPackages.apsw |