Added cabalized darcs-2 and associated Haskell libs.

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

1 files changed, 33 insertions, 4 deletions

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5619be1a6b781..dded9bf3bec71 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -79,15 +79,39 @@ rec {
     inherit (pkgs) sqlite;
   };
 
+  html = import ../development/libraries/haskell/html {
+    inherit cabal;
+  };
+
   monadlab = import ../development/libraries/haskell/monadlab {
     inherit cabal;
   };
 
+  mtl = import ../development/libraries/haskell/mtl {
+    inherit cabal;
+  };
+
+  parsec = import ../development/libraries/haskell/parsec {
+    inherit cabal;
+  };
+
   pcreLight = import ../development/libraries/haskell/pcre-light {
     inherit cabal;
     inherit (pkgs) pcre;
   };
 
+  regexBase = import ../development/libraries/haskell/regex-base {
+    inherit cabal mtl;
+  };
+
+  regexCompat = import ../development/libraries/haskell/regex-compat {
+    inherit cabal regexBase regexPosix;
+  };
+
+  regexPosix = import ../development/libraries/haskell/regex-posix {
+    inherit cabal regexBase;
+  };
+
   uuagc = import ../development/tools/haskell/uuagc {
     inherit cabal uulib;
   };
@@ -101,16 +125,20 @@ rec {
     inherit (pkgs) stdenv fetchurl unzip wxGTK;
   };
 
-  X11 = import ../development/libraries/haskell/X11 {
+  unix = import ../development/libraries/haskell/unix {
     inherit cabal;
-    inherit (pkgs.xlibs) libX11 libXinerama libXext;
-    xineramaSupport = true;
   };
 
   vty = import ../development/libraries/haskell/vty {
     inherit cabal;
   };
 
+  X11 = import ../development/libraries/haskell/X11 {
+    inherit cabal;
+    inherit (pkgs.xlibs) libX11 libXinerama libXext;
+    xineramaSupport = true;
+  };
+
   zlib = import ../development/libraries/haskell/zlib {
     inherit cabal zlib;
   };
@@ -150,7 +178,8 @@ rec {
   # Applications.
 
   darcs = import ../applications/version-management/darcs/darcs-2.nix {
-    inherit cabal;
+    inherit cabal html mtl parsec regexCompat;
+    inherit (pkgs) zlib curl;
   };
 
   xmobar = import ../applications/misc/xmobar {