More Haskell platform packages.

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

9 files changed, 79 insertions, 11 deletions

diff --git a/pkgs/applications/version-management/darcs/darcs-2.nix b/pkgs/applications/version-management/darcs/darcs-2.nix
index 216f2c835808..c0efa78553b6 100644
--- a/pkgs/applications/version-management/darcs/darcs-2.nix
+++ b/pkgs/applications/version-management/darcs/darcs-2.nix
@@ -1,4 +1,4 @@
-{cabal, html, mtl, parsec, regexCompat, zlib, curl} : /* , ghc, zlib, ncurses, curl, perl */
+{cabal, html, mtl, parsec, regexCompat, zlib, curl} :
 
 cabal.mkDerivation (self : {
   pname = "darcs";
@@ -7,9 +7,6 @@ cabal.mkDerivation (self : {
   sha256 = "0iy4d4qls6yhwmgv87pz4kmr5jh4bwigz1wfwzns71b68csynnsp";
 
   extraBuildInputs = [html mtl parsec regexCompat zlib curl];
-  #buildInputs = [ghc zlib ncurses curl perl];
-
-  #NIX_LDFLAGS = "-lz";
 
   meta = {
     homepage = http://darcs.net/;
diff --git a/pkgs/development/libraries/haskell/HTTP/default.nix b/pkgs/development/libraries/haskell/HTTP/default.nix
index 1d3f0f1a9bcc..e630a3c72dea 100644
--- a/pkgs/development/libraries/haskell/HTTP/default.nix
+++ b/pkgs/development/libraries/haskell/HTTP/default.nix
@@ -1,9 +1,10 @@
-{cabal}:
+{cabal, mtl, network, parsec}:
 
 cabal.mkDerivation (self : {
   pname = "HTTP";
-  version = "3001.0.0";
-  sha256 = "0d1ixrylb7vl5q963r31jc8gsqm24bkjas4dyi6ks8kbhzrgrw17";
+  version = "4000.0.5"; # Haskell Platform 2009.0.0
+  sha256 = "54cbb211e73f183aa91780afd6cc7c830edef1b2eb5ce8dc05e5fa539bb685d8";
+  propagatedBuildInputs = [mtl network parsec];
   meta = {
     description = "a Haskell library for client-side HTTP";
   };
diff --git a/pkgs/development/libraries/haskell/cgi/default.nix b/pkgs/development/libraries/haskell/cgi/default.nix
new file mode 100644
index 000000000000..e6e5bd91df6e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cgi/default.nix
@@ -0,0 +1,12 @@
+{cabal, mtl, network, parsec, xhtml}:
+
+cabal.mkDerivation (self : {
+  pname = "cgi";
+  version = "3001.1.7.1"; # Haskell Platform 2009.0.0
+  sha256 = "7d1d710871fffbbec2a33d7288b2959ddbcfd794d47f0122127576c02550b339";
+  propagatedBuildInputs = [mtl network parsec xhtml];
+  meta = {
+    description = "A library for writing CGI programs";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/fgl/default.nix b/pkgs/development/libraries/haskell/fgl/default.nix
new file mode 100644
index 000000000000..062e0a5ac590
--- /dev/null
+++ b/pkgs/development/libraries/haskell/fgl/default.nix
@@ -0,0 +1,12 @@
+{cabal, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "fgl";
+  version = "5.4.2.2";
+  sha256 = "8232c337f0792854bf2a12a5fd1bc46726fff05d2f599053286ff873364cd7d2";
+  propagatedBuildInputs = [mtl];
+  meta = {
+    description = "Martin Erwig's Functional Graph Library";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/stm/default.nix b/pkgs/development/libraries/haskell/stm/default.nix
new file mode 100644
index 000000000000..707fd980cbf2
--- /dev/null
+++ b/pkgs/development/libraries/haskell/stm/default.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "stm";
+  version = "2.1.1.2"; # Haskell Platform 2009.0.0
+  sha256 = "68d550067ae180373142c51f3fa14bdf0a1516310aee9a37e28f9ac7cf3b8c6d";
+  meta = {
+    description = "Software Transactional Memory";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/time/default.nix b/pkgs/development/libraries/haskell/time/default.nix
new file mode 100644
index 000000000000..24b78a54ed8f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/time/default.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "time";
+  version = "1.1.2.4"; # Haskell Platform 2009.0.0
+  sha256 = "11dfcb9b5ca76428a7a31019928c3c1898320f774e5d3df8e4407580d074fad3";
+  meta = {
+    description = "A time library";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/zlib/default.nix b/pkgs/development/libraries/haskell/zlib/default.nix
index 268a43b5ea3f..f034e43160af 100644
--- a/pkgs/development/libraries/haskell/zlib/default.nix
+++ b/pkgs/development/libraries/haskell/zlib/default.nix
@@ -2,8 +2,10 @@
 
 cabal.mkDerivation (self : {
   pname = "zlib";
-  version = "0.4.0.2";
-  sha256 = "e6e9e51ca5b7f1685eb031f826f7865acc10cc2c8d0dfad975e0e81fd17f17ed";
+  version = "0.5.0.0"; # Haskell Platform 2009.0.0
+  sha256 = "20e067cfbec87ec062ac144875a60e158ea6cf7836aac031ec367fcdd5446891";
+  # TODO: find out exactly why propagated is needed here (to build other
+  # packages depending on zlib):
   propagatedBuildInputs = [zlib];
   meta = {
     description = "Compression and decompression in the gzip and zlib formats";
diff --git a/pkgs/tools/package-management/cabal-install/default.nix b/pkgs/tools/package-management/cabal-install/default.nix
new file mode 100644
index 000000000000..aafafab453de
--- /dev/null
+++ b/pkgs/tools/package-management/cabal-install/default.nix
@@ -0,0 +1,13 @@
+{cabal, HTTP, network, zlib} :
+
+cabal.mkDerivation (self : {
+  pname = "cabal-install";
+  name = self.fname;
+  version = "0.6.2"; # Haskell Platform 2009.0.0
+  sha256 = "d8ea91bd0a2a624ab1cf52ddfe48cef02b532bb5e2fcda3fd72ca51efc04b41a";
+  extraBuildInputs = [HTTP network zlib];
+
+  meta = {
+    description = "The command-line interface for Cabal and Hackage";
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 448b5e0c8908..08e850c5d79b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -58,7 +58,7 @@ rec {
   };
   
   HTTP = import ../development/libraries/haskell/HTTP {
-    inherit cabal;
+    inherit cabal mtl network parsec;
   };
 
   haxr = import ../development/libraries/haskell/haxr {
@@ -144,6 +144,10 @@ rec {
     inherit cabal;
   };
 
+  time = import ../development/libraries/haskell/time {
+    inherit cabal;
+  };
+
   uuagc = import ../development/tools/haskell/uuagc {
     inherit cabal uulib;
   };
@@ -172,7 +176,8 @@ rec {
   };
 
   zlib = import ../development/libraries/haskell/zlib {
-    inherit cabal zlib;
+    inherit cabal;
+    inherit (pkgs) zlib;
   };
 
 
@@ -247,6 +252,10 @@ rec {
 
   # Tools.
 
+  cabalInstall = import ../tools/package-management/cabal-install {
+    inherit cabal HTTP network zlib;
+  };
+
   lhs2tex = import ../tools/typesetting/lhs2tex {
     inherit ghc;
     inherit (pkgs) fetchurl stdenv tetex polytable;