From a38b628246ebe1d94b8d6c3046cd7fceede46a20 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 4 Oct 2011 14:58:28 +0000
Subject: [PATCH 1/2] haskell-haddock: updated to version 2.9.4

svn path=/nixpkgs/trunk/; revision=29635
---
 .../tools/documentation/haddock/{2.9.3.nix => 2.9.4.nix}      | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename pkgs/development/tools/documentation/haddock/{2.9.3.nix => 2.9.4.nix} (86%)

diff --git a/pkgs/development/tools/documentation/haddock/2.9.3.nix b/pkgs/development/tools/documentation/haddock/2.9.4.nix
similarity index 86%
rename from pkgs/development/tools/documentation/haddock/2.9.3.nix
rename to pkgs/development/tools/documentation/haddock/2.9.4.nix
index 1d12654b33f..a0631117650 100644
--- a/pkgs/development/tools/documentation/haddock/2.9.3.nix
+++ b/pkgs/development/tools/documentation/haddock/2.9.4.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haddock";
-  version = "2.9.3";
-  sha256 = "0r3yp5s7qv9hmwwfz8rxbwj39qpysgyg53ka4alaxnfma0a96iyj";
+  version = "2.9.4";
+  sha256 = "18w5pa1zpjy9mmdzjh0hs8jybmky8j87vzry54nni6a3517c5x86";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ ghcPaths xhtml ];
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a2c2e88830a..738205ea23c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1378,7 +1378,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   haddock_2_4_2 = callPackage ../development/tools/documentation/haddock/2.4.2.nix {};
   haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix {};
   haddock_2_9_2 = callPackage ../development/tools/documentation/haddock/2.9.2.nix {};
-  haddock_2_9_3 = callPackage ../development/tools/documentation/haddock/2.9.3.nix {};
+  haddock_2_9_4 = callPackage ../development/tools/documentation/haddock/2.9.4.nix {};
   haddock = self.haddock_2_7_2;
 
   happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {};

From 1b87ef25db3c2486dfc8eba34a4e61afde220093 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 4 Oct 2011 15:20:17 +0000
Subject: [PATCH 2/2] calibre-0.8.21

The old version failed to build on hydra, so I've upgraded

svn path=/nixpkgs/trunk/; revision=29637
---
 pkgs/applications/misc/calibre/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index f892cf175c1..421fb40e1bd 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -1,21 +1,21 @@
 { stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng
-, imagemagick, libjpeg, fontconfig, podofo, qt4
+, imagemagick, libjpeg, fontconfig, podofo, qt4, icu
 , pil, makeWrapper, unrar, chmlib, pythonPackages
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-0.7.14";
+  name = "calibre-0.8.21";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.gz";
-    sha256 = "07vnmxxpg77pmd7fhcrlnark02bn6zj62hbsybdqz8fp1yp99wkn";
+    sha256 = "173is8qlsm1gbsx5a411c2226kakwyv200wcw97yfs613k7cz256";
   };
 
   inherit python;
 
   buildInputs =
     [ python pyqt4 sip popplerQt4 pkgconfig libpng imagemagick libjpeg
-      fontconfig podofo qt4 pil makeWrapper chmlib 
+      fontconfig podofo qt4 pil makeWrapper chmlib icu
       pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
       pythonPackages.cssutils pythonPackages.beautifulsoap pythonPackages.sqlite3
     ];