Author: urkud
Date: Thu Dec 15 06:58:27 2011
New Revision: 30900
URL: https://nixos.org/websvn/nix/?rev=30900&sc=1
Log:
calibre-0.8.30
Modified:
nixpkgs/trunk/pkgs/applications/misc/calibre/default.nix
Modified: nixpkgs/trunk/pkgs/applications/misc/calibre/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/misc/calibre/default.nix Wed Dec 14
23:30:06 2011 (r30899)
+++ nixpkgs/trunk/pkgs/applications/misc/calibre/default.nix Thu Dec 15
06:58:27 2011 (r30900)
@@ -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
];
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
