* Updated darcs to 2.4.4.

* Added Haskell Platform 2010.2.0.0.
* Added cairo package in preparation for adding a new gtk2hs.

svn path=/nixpkgs/trunk/; revision=22714

7 files changed, 49 insertions, 11 deletions

diff --git a/pkgs/applications/version-management/darcs/darcs-2.nix b/pkgs/applications/version-management/darcs/darcs-2.nix
index c399c523f8994..a5cd1f5a168f2 100644
--- a/pkgs/applications/version-management/darcs/darcs-2.nix
+++ b/pkgs/applications/version-management/darcs/darcs-2.nix
@@ -3,8 +3,8 @@
 cabal.mkDerivation (self : {
   pname = "darcs";
   name = self.fname;
-  version = "2.4.1";
-  sha256 = "6ac0e84d2eca160e6e33755679dfb185d9b5f9f5bdc43f99db326210aabbc4aa";
+  version = "2.4.4";
+  sha256 = "97cde35ae4b74488f8b98b487bc0498069eaa74fe035903394f3d4aff1da9f9e";
 
   extraBuildInputs = [
     html parsec regexCompat curl haskeline hashedStorage zlib
diff --git a/pkgs/development/libraries/haskell/cabal/cabal.nix b/pkgs/development/libraries/haskell/cabal/cabal.nix
index fc719e032ac24..87e2563bc7b46 100644
--- a/pkgs/development/libraries/haskell/cabal/cabal.nix
+++ b/pkgs/development/libraries/haskell/cabal/cabal.nix
@@ -54,9 +54,12 @@
                 test -f $i && ghc --make $i
               done
 
-              for p in $propagatedBuildNativeInputs; do
+              for p in $extraBuildInputs $propagatedBuildNativeInputs; do
+                if [ -d "$p/include" ]; then
+                  extraLibDirs="$extraLibDirs --extra-include-dir=$p/include"
+                fi
                 for d in lib{,64}; do
-                  if [ -e "$p/$d" ]; then
+                  if [ -d "$p/$d" ]; then
                     extraLibDirs="$extraLibDirs --extra-lib-dir=$p/$d"
                   fi
                 done
diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix
new file mode 100644
index 0000000000000..df4cdf5b46498
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cairo/default.nix
@@ -0,0 +1,14 @@
+{cabal, gtk2hsBuildtools, pkgconfig, glibc, cairo, zlib, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "cairo";
+  version = "0.11.0";
+  sha256 = "f7971180bbd40c2a19b2e97fe40bd4a296b3aaf3edcf6621009780d723405c5a";
+  extraBuildInputs = [pkgconfig glibc cairo zlib gtk2hsBuildtools];
+  propagatedBuildInputs = [mtl];
+  meta = {
+    description = "Binding to the Cairo library";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
new file mode 100644
index 0000000000000..41a3ac41e54dd
--- /dev/null
+++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
@@ -0,0 +1,13 @@
+{cabal, alex, happy}:
+
+cabal.mkDerivation (self : {
+  pname = "gtk2hs-buildtools";
+  version = "0.9";
+  sha256 = "2586c419394601c1840d827d32cdb9d76bc94d71c03fdfa23c8d04cba99c6b20";
+  extraBuildInputs = [alex happy];
+  meta = {
+    description = "Tools to build the Gtk2Hs suite of User Interface libraries";
+    license = "GPL";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hashed-storage/default.nix b/pkgs/development/libraries/haskell/hashed-storage/default.nix
index ff89b3b8f109b..fb096838ed4fe 100644
--- a/pkgs/development/libraries/haskell/hashed-storage/default.nix
+++ b/pkgs/development/libraries/haskell/hashed-storage/default.nix
@@ -2,12 +2,11 @@
 
 cabal.mkDerivation (self : {
   pname = "hashed-storage";
-  version = "0.4.11";
-  sha256 = "c719f9b86c5a517324ce3448fcb4b6377ccbfa085268b396bec47b8bbcfbde1b";
+  version = "0.4.13";
+  sha256 = "c4e8dbd23469cde19696344f3e56088313ce5ee823e2d89ad2d0cb1fce602b63";
   propagatedBuildInputs = [mtl zlib mmap binary dataenc];
   meta = {
     description = "Hashed file storage support code";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
-
+})
diff --git a/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix
index 95ee5e6beb3c6..5e39d3ddffb3a 100644
--- a/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix
+++ b/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix
@@ -7,7 +7,7 @@ cabal.mkDerivation (self : {
   version = "2010.2.0.0";
   src = fetchurl {
     url = "http://hackage.haskell.org/platform/${self.version}/cabal/${self.pname}-${self.version}.tar.gz";
-    sha256 = "b0f4e6827d653f68865f39679c7c4fd5c22030ef5d7d24df3270aa6db4b016d4";
+    sha256 = "c0b0b45151e74cff759ae25083c2ff7a7af4d2f74c19294b78730c879864f3c0";
   };
   propagatedBuildInputs = [
     GLUT HTTP HUnit OpenGL QuickCheck cgi fgl
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 2c29cbf2766d6..5b94cf098c642 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -73,6 +73,11 @@ rec {
     inherit cabal bytestring network;
   };
 
+  cairo = import ../development/libraries/haskell/cairo {
+    inherit cabal gtk2hsBuildtools mtl;
+    inherit (pkgs) pkgconfig glibc cairo zlib;
+  };
+
   cautiousFile = import ../development/libraries/haskell/cautious-file {
     inherit cabal;
   };
@@ -259,6 +264,12 @@ rec {
     inherit (pkgs) stdenv fetchurl pkgconfig gnome cairo;
   };
 
+  gtk2hsBuildtools = import ../development/libraries/haskell/gtk2hs-buildtools {
+    inherit cabal;
+    alex = alex233;
+    happy = happy1185;
+  };
+
   hamlet = import ../development/libraries/haskell/hamlet {
     inherit cabal blazeHtml parsec utf8String;
   };
@@ -330,7 +341,6 @@ rec {
     inherit cabal haskellSrcExts;
   };
 
-  /*
   haskellPlatform2010200 = pkgs.lowPrio (import ../development/libraries/haskell/haskell-platform/2010.2.0.0.nix {
     inherit cabal ghc
       html xhtml;
@@ -355,7 +365,6 @@ rec {
     happy = happy1185;
     inherit (pkgs) fetchurl;
   });
-  */
 
   haskellPlatform2010100 = pkgs.lowPrio (import ../development/libraries/haskell/haskell-platform/2010.1.0.0.nix {
     inherit cabal ghc fgl