Last batch of Haskell expression updates.

 * haskell-mkcabal: updated to version 1.0.0
 * haskell-ghc-syb-utils: updated to version 0.2.1.0
 * haskell-darcs: updated to version 2.5.2

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

2 files changed, 34 insertions, 17 deletions

diff --git a/pkgs/applications/version-management/darcs/darcs-2.nix b/pkgs/applications/version-management/darcs/darcs-2.nix
index f89b29d95f112..6a0f41594d6f0 100644
--- a/pkgs/applications/version-management/darcs/darcs-2.nix
+++ b/pkgs/applications/version-management/darcs/darcs-2.nix
@@ -1,20 +1,27 @@
-{cabal, curl, html, mtl, parsec, regexCompat, haskeline, hashedStorage, zlib, tar, text} :
+{ cabal, curl, HTTP, extensibleExceptions, hashedStorage, haskeline
+, html, mmap, mtl, network, parsec, regexCompat, tar, terminfo
+, text, zlib
+}:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "darcs";
-  name = self.fname;
-  version = "2.5.1";
-  sha256 = "0h7i2nw1fkmdrvwgzccqvbbfx8bdhn0h9d5rd98ayjs207dnvrj8";
-
-  propagatedBuildInputs = [
-    curl html parsec regexCompat haskeline hashedStorage zlib tar text
+  version = "2.5.2";
+  sha256 = "11mk1xcrxk2x5c0s96s19wb4xvhjl9s59bdqcrj8f4w09zbgjlw9";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    HTTP extensibleExceptions hashedStorage haskeline html mmap mtl
+    network parsec regexCompat tar terminfo text zlib
   ];
-
+  extraLibraries = [ curl ];
   meta = {
-    homepage = http://darcs.net/;
-    description = "Patch-based version management system";
+    homepage = "http://darcs.net/";
+    description = "a distributed, interactive, smart revision control system";
     license = "GPL";
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
-
 })
diff --git a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
index a8b39e6e5b0df..25d55fc73f013 100644
--- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
@@ -1,11 +1,21 @@
-{cabal, xmonad, X11, utf8String, X11Xft}:
+{ cabal, X11, X11Xft, extensibleExceptions, mtl, utf8String, xmonad
+}:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "xmonad-contrib";
   version = "0.9.2";
   sha256 = "06hg5j4w8iz62wmyygq4c7xcbi9dxlhhh3dbic438cjk7c0w1h5p";
-  propagatedBuildInputs = [X11 xmonad utf8String X11Xft];
+  buildDepends = [
+    X11 X11Xft extensibleExceptions mtl utf8String xmonad
+  ];
   meta = {
-    description = "a huge extension library for xmonad";
+    homepage = "http://xmonad.org/";
+    description = "Third party extensions for xmonad";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })