From 30a9cbf018c64e8131dbc4968cb554c17721e8e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 28 Feb 2010 22:42:39 +0000
Subject: [PATCH] Updating calibre (I had to add a new python package for it:
 cssutils)

svn path=/nixpkgs/trunk/; revision=20291
---
 pkgs/applications/misc/calibre/default.nix |  9 +++++----
 pkgs/top-level/all-packages.nix            |  2 +-
 pkgs/top-level/python-packages.nix         | 22 ++++++++++++++++++++++
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 43395b76941c..60505d50056e 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -1,21 +1,22 @@
 {stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng,
 imagemagick, libjpeg, fontconfig, podofo, qt4, mechanize, lxml, dateutil,
-pil, makeWrapper, unrar}:
+pil, cssutils, makeWrapper, unrar}:
 
 stdenv.mkDerivation rec {
-  name = "calibre-0.6.32";
+  name = "calibre-0.6.43";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.gz";
-    sha256 = "0r646k5yig9y139jpajsr5scwsqjbgyq94klj7f2b8wjw79qpsmz";
+    sha256 = "1fqrishm5na2h0jh46w1gj7gvav335fixwrk6y7l7l4a6argjslr";
   };
 
   inherit python;
 
   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 = ''
+    export HOME=$TMPDIR/fakehome
     export POPPLER_INC_DIR=${popplerQt4}/include/poppler
     export POPPLER_LIB_DIR=${popplerQt4}/lib
     export MAGICK_INC=${imagemagick}/include/ImageMagick
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6fe2d1203cff..c8103e2a756a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6787,7 +6787,7 @@ let
     sip = sip_python26;
     pil = pil_python26;
     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) {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6b39d019a982..5c6d7d6328c0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -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 {
     name = "darcsver-1.3.1";