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

Updating calibre (I had to add a new python package for it: cssutils) 

svn path=/nixpkgs/trunk/; revision=20291
This commit is contained in:
Lluís Batlle i Rossell 2010-02-28 22:42:39 +00:00
parent 01d5ec596b
commit 30a9cbf018
3 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,21 +1,22 @@
{stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng, {stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng,
imagemagick, libjpeg, fontconfig, podofo, qt4, mechanize, lxml, dateutil, imagemagick, libjpeg, fontconfig, podofo, qt4, mechanize, lxml, dateutil,
pil, makeWrapper, unrar}: pil, cssutils, makeWrapper, unrar}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "calibre-0.6.32"; name = "calibre-0.6.43";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/calibre/${name}.tar.gz"; url = "mirror://sourceforge/calibre/${name}.tar.gz";
sha256 = "0r646k5yig9y139jpajsr5scwsqjbgyq94klj7f2b8wjw79qpsmz"; sha256 = "1fqrishm5na2h0jh46w1gj7gvav335fixwrk6y7l7l4a6argjslr";
}; };
inherit python; inherit python;
buildInputs = [ python pyqt4 sip popplerQt4 pkgconfig libpng imagemagick buildInputs = [ python pyqt4 sip popplerQt4 pkgconfig libpng imagemagick
libjpeg fontconfig podofo qt4 mechanize lxml dateutil pil makeWrapper ]; libjpeg fontconfig podofo qt4 mechanize lxml dateutil pil makeWrapper cssutils ];
installPhase = '' installPhase = ''
export HOME=$TMPDIR/fakehome
export POPPLER_INC_DIR=${popplerQt4}/include/poppler export POPPLER_INC_DIR=${popplerQt4}/include/poppler
export POPPLER_LIB_DIR=${popplerQt4}/lib export POPPLER_LIB_DIR=${popplerQt4}/lib
export MAGICK_INC=${imagemagick}/include/ImageMagick export MAGICK_INC=${imagemagick}/include/ImageMagick

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

@ -6787,7 +6787,7 @@ let
sip = sip_python26; sip = sip_python26;
pil = pil_python26; pil = pil_python26;
popplerQt4 = popplerQt45; popplerQt4 = popplerQt45;
inherit (python26Packages) mechanize lxml dateutil; inherit (python26Packages) mechanize lxml dateutil cssutils;
}; };
carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) { carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) {

22
pkgs/top-level/python-packages.nix
View File

@ -57,6 +57,28 @@ rec {
}; };
}); });
cssutils = buildPythonPackage (rec {
name = "cssutils-0.9.7a2";
src = fetchurl {
url = http://cssutils.googlecode.com/files/cssutils-0.9.7a2.zip;
sha256 = "068p14qhhczpjgn0w7v57a2swj0g4rndhimh8gkg9h9sd7rp6n07";
};
buildInputs = [ pkgs.unzip ];
# The tests fail - I don't know why
doCheck = false;
meta = {
description = "A Python package to parse and build CSS";
homepage = http://code.google.com/p/cssutils/;
license = "LGPLv3+";
};
});
darcsver = buildPythonPackage (rec { darcsver = buildPythonPackage (rec {
name = "darcsver-1.3.1"; name = "darcsver-1.3.1";