From 12a05f16380e0c2a48c7dd3196dcbdb218ca52e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Sun, 19 Apr 2009 13:38:34 +0000
Subject: [PATCH] More Haskell Platform.

svn path=/nixpkgs/trunk/; revision=15153
---
 .../libraries/haskell/ghc-paths/default.nix          | 11 +++++++++++
 .../tools/documentation/haddock/haddock-2.4.2.nix    | 12 ++++++++++++
 pkgs/development/tools/parsing/alex/default.nix      |  4 ++--
 pkgs/top-level/haskell-packages.nix                  |  8 ++++++++
 4 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/ghc-paths/default.nix
 create mode 100644 pkgs/development/tools/documentation/haddock/haddock-2.4.2.nix

diff --git a/pkgs/development/libraries/haskell/ghc-paths/default.nix b/pkgs/development/libraries/haskell/ghc-paths/default.nix
new file mode 100644
index 00000000000..dadd195acfe
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ghc-paths/default.nix
@@ -0,0 +1,11 @@
+{ cabal } :
+
+cabal.mkDerivation (self : {
+  pname = "ghc-paths";
+  version = "0.1.0.5";
+  sha256 = "ea9e97425894e3dbd7915e00e107e2e7fc07b6e8293fd2dd66a813f0673cba10";
+  meta = {
+    description = "Knowledge of GHC's installations directories";
+  };
+})  
+
diff --git a/pkgs/development/tools/documentation/haddock/haddock-2.4.2.nix b/pkgs/development/tools/documentation/haddock/haddock-2.4.2.nix
new file mode 100644
index 00000000000..f3290d15fd6
--- /dev/null
+++ b/pkgs/development/tools/documentation/haddock/haddock-2.4.2.nix
@@ -0,0 +1,12 @@
+{cabal, ghcPaths}:
+
+cabal.mkDerivation (self : {
+  pname = "haddock";
+  version = "2.4.2"; # Haskell Platform 2009.0.0
+  name = self.fname;
+  sha256 = "dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547";
+  propagatedBuildInputs = [ghcPaths];
+  meta = {
+    description = "a tool for automatically generating documentation from annotated Haskell source code";
+  };
+})
diff --git a/pkgs/development/tools/parsing/alex/default.nix b/pkgs/development/tools/parsing/alex/default.nix
index 273a25753e8..aab99629b31 100644
--- a/pkgs/development/tools/parsing/alex/default.nix
+++ b/pkgs/development/tools/parsing/alex/default.nix
@@ -2,9 +2,9 @@
 
 cabal.mkDerivation (self : {
   pname = "alex";
-  version = "2.2";
+  version = "2.3.1"; # Haskell Platform 2009.0.0
   name = self.fname;
-  sha256 = "e958d4fc6cfdb1d351dc39a45ea882f23b1b1773a736d43814a52d4939a41ffe";
+  sha256 = "cdd42fd992a72fedeff1f38debc21aa315d90dc070f0945d7819c0bccd549a44";
   extraBuildInputs = [perl];
   meta = {
     description = "A lexical analyser generator for Haskell";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 08e850c5d79..8e266f4ba99 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -47,6 +47,10 @@ rec {
   fgl = import ../development/libraries/haskell/fgl {
     inherit cabal mtl;
   };
+
+  ghcPaths = import ../development/libraries/haskell/ghc-paths {
+    inherit cabal;
+  };
   
   gtk2hs = import ../development/libraries/haskell/gtk2hs {
     inherit (pkgs) pkgconfig stdenv fetchurl cairo ghc;
@@ -216,6 +220,10 @@ rec {
     inherit cabal;
   });
 
+  haddock242 = import ../development/tools/documentation/haddock/haddock-2.4.2.nix {
+    inherit cabal ghcPaths;
+  };
+
   happy = happy1182;
 
   happy117 = import ../development/tools/parsing/happy/happy-1.17.nix {