summary refs log tree commit diff
path: root/pkgs/applications/misc/calibre
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2011-12-15 06:58:27 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2011-12-15 06:58:27 +0000
commit471ebaf6f8501f259c6afb7e99f3d3373e0d564c (patch)
treef42ba8e905d8f49e1cd75f51290e1bef6671ade9 /pkgs/applications/misc/calibre
parentaaba1c0bf9d08af03ed8bde45c6e309f6cd1b0d3 (diff)
downloadnixlib-471ebaf6f8501f259c6afb7e99f3d3373e0d564c.tar
nixlib-471ebaf6f8501f259c6afb7e99f3d3373e0d564c.tar.gz
nixlib-471ebaf6f8501f259c6afb7e99f3d3373e0d564c.tar.bz2
nixlib-471ebaf6f8501f259c6afb7e99f3d3373e0d564c.tar.lz
nixlib-471ebaf6f8501f259c6afb7e99f3d3373e0d564c.tar.xz
nixlib-471ebaf6f8501f259c6afb7e99f3d3373e0d564c.tar.zst
nixlib-471ebaf6f8501f259c6afb7e99f3d3373e0d564c.zip
calibre-0.8.30
svn path=/nixpkgs/trunk/; revision=30900
Diffstat (limited to 'pkgs/applications/misc/calibre')
-rw-r--r--pkgs/applications/misc/calibre/default.nix14
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 421fb40e1bdf..b38a6cb5644b 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -1,21 +1,23 @@
 { stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng
 , imagemagick, libjpeg, fontconfig, podofo, qt4, icu
-, pil, makeWrapper, unrar, chmlib, pythonPackages
+, pil, makeWrapper, unrar, chmlib, pythonPackages, xz
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-0.8.21";
+  name = "calibre-0.8.30";
 
   src = fetchurl {
-    url = "mirror://sourceforge/calibre/${name}.tar.gz";
-    sha256 = "173is8qlsm1gbsx5a411c2226kakwyv200wcw97yfs613k7cz256";
+    url = "http://calibre-ebook.googlecode.com/files/${name}.tar.xz";
+    sha256 = "1w94kaynxiksjfi6wqlvwnryl08f8m0ylqwgzwkz1hjznqiji282";
   };
 
   inherit python;
 
+  buildNativeInputs = [ makeWrapper xz pkgconfig ];
+
   buildInputs =
-    [ python pyqt4 sip popplerQt4 pkgconfig libpng imagemagick libjpeg
-      fontconfig podofo qt4 pil makeWrapper chmlib icu
+    [ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg
+      fontconfig podofo qt4 pil chmlib icu
       pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
       pythonPackages.cssutils pythonPackages.beautifulsoap pythonPackages.sqlite3
     ];