Merge from trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=29461

pkgs/tools/misc/cunit/default.nix

@@ -0,0 +1,27 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "CUnit-2.1-2";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/cunit/${name}-src.tar.bz2";
+    sha256 = "1slb2sybv886ys0qqikb8lzn0h9jcqfrv64lakdxmqbgncq5yw0z";
+  };
+
+  meta = {
+    description = "A Unit Testing Framework for C";
+
+    longDescription = ''
+      CUnit is a lightweight system for writing, administering, and running
+      unit tests in C.  It provides C programmers a basic testing functionality
+      with a flexible variety of user interfaces.
+    '';
+
+    homepage = http://cunit.sourceforge.net/;
+
+    license = "lgpl";
+
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+  };
+}
+

pkgs/tools/misc/myhasktags/default.nix

@@ -4,7 +4,7 @@
 
    packageOverrides = {
 
-    haskellCollection = 
+    haskellCollection =
      let hp = haskellPackages;
          install = [ hp.QuickCheck /* ... * /];
       in
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   version = "0.0"; # Haskell Platform 2009.0.0
   src = fetchurl {
     url = http://mawercer.de/~nix/hasktags.hs;
-    sha256 = "e5ce4c4e1f5916baf9395174978faee67a86ff5350936c82e115939812a4d579";
+    sha256 = "0zdin03n357viyyqbn2d029jxd83nyazhaxbxfc8v3jrz5pkwl2c";
   };
   phases="buildPhase";
   buildPhase = ''