Towards Haskell Platform support.

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

1 files changed, 47 insertions, 5 deletions

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 3c6049bd3c49a..448b5e0c89088 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -27,14 +27,14 @@ rec {
     inherit cabal;
   };
 
-  maybench = import ../development/libraries/haskell/maybench {
-    inherit cabal benchpress;
-  };
-
   binary = import ../development/libraries/haskell/binary {
     inherit cabal;
   };
 
+  cgi = import ../development/libraries/haskell/cgi {
+    inherit cabal mtl network parsec xhtml;
+  };
+
   Crypto = import ../development/libraries/haskell/Crypto {
     inherit cabal;
   };
@@ -43,11 +43,19 @@ rec {
     inherit (pkgs) libedit;
     inherit cabal;
   };
+
+  fgl = import ../development/libraries/haskell/fgl {
+    inherit cabal mtl;
+  };
   
   gtk2hs = import ../development/libraries/haskell/gtk2hs {
     inherit (pkgs) pkgconfig stdenv fetchurl cairo ghc;
     inherit (pkgs.gnome) gtk glib GConf libglade libgtkhtml gtkhtml;
   };
+
+  haskellSrc = import ../development/libraries/haskell/haskell-src {
+    inherit cabal happy;
+  };
   
   HTTP = import ../development/libraries/haskell/HTTP {
     inherit cabal;
@@ -83,6 +91,14 @@ rec {
     inherit cabal;
   };
 
+  HUnit = import ../development/libraries/haskell/HUnit {
+    inherit cabal;
+  };
+
+  maybench = import ../development/libraries/haskell/maybench {
+    inherit cabal benchpress;
+  };
+
   monadlab = import ../development/libraries/haskell/monadlab {
     inherit cabal;
   };
@@ -91,6 +107,14 @@ rec {
     inherit cabal;
   };
 
+  network = import ../development/libraries/haskell/network {
+    inherit cabal parsec;
+  };
+
+  parallel = import ../development/libraries/haskell/parallel {
+    inherit cabal;
+  };
+
   parsec = import ../development/libraries/haskell/parsec {
     inherit cabal;
   };
@@ -100,6 +124,10 @@ rec {
     inherit (pkgs) pcre;
   };
 
+  QuickCheck = import ../development/libraries/haskell/QuickCheck {
+    inherit cabal;
+  };
+
   regexBase = import ../development/libraries/haskell/regex-base {
     inherit cabal mtl;
   };
@@ -112,6 +140,10 @@ rec {
     inherit cabal regexBase;
   };
 
+  stm = import ../development/libraries/haskell/stm {
+    inherit cabal;
+  };
+
   uuagc = import ../development/tools/haskell/uuagc {
     inherit cabal uulib;
   };
@@ -135,6 +167,10 @@ rec {
     xineramaSupport = true;
   };
 
+  xhtml = import ../development/libraries/haskell/xhtml {
+    inherit cabal;
+  };
+
   zlib = import ../development/libraries/haskell/zlib {
     inherit cabal zlib;
   };
@@ -175,11 +211,17 @@ rec {
     inherit cabal;
   });
 
-  happy = import ../development/tools/parsing/happy/happy-1.17.nix {
+  happy = happy1182;
+
+  happy117 = import ../development/tools/parsing/happy/happy-1.17.nix {
     inherit cabal;
     inherit (pkgs) perl;
   };
 
+  happy1182 = import ../development/tools/parsing/happy/happy-1.18.2.nix {
+    inherit cabal mtl;
+    inherit (pkgs) perl;
+  };
 
   # Applications.