Merging from trunk. I had to do two manual merges, quite trivial I think.

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

pkgs/tools/text/cheetah-template/2.0.1.nix

@@ -11,7 +11,7 @@ rec {
   /* doConfigure should be specified separately */
   phaseNames = ["installPythonPackage" (makeManyWrappers ''$out/bin/*'' ''--prefix PYTHONPATH : $(toPythonPath $out)'')];
       
-  name = "cheetah-template-" + version;
+  name = "cheetah-template-2.0.1";
   meta = {
     description = "Templating engine";
   };

pkgs/tools/text/highlight/2.6.10.nix

@@ -1,20 +0,0 @@
-
-args : with args; 
-rec {
-  src = fetchurl {
-    url = http://www.andre-simon.de/zip/highlight-2.6.10.tar.bz2;
-    sha256 = "18f2ki9pajxlp0aq4ingxj7m0cp7wlbc40xm25pnxc1yis9vlira";
-  };
-
-  buildInputs = [getopt];
-  configureFlags = [];
-  makeFlags = ["PREFIX=$out"];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doMakeInstall"];
-      
-  name = "highlight-" + version;
-  meta = {
-    description = "Source code highlighting tool";
-  };
-}

pkgs/tools/text/highlight/default.nix

@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, getopt }:
+        
+stdenv.mkDerivation rec {
+  name = "highlight-2.6.10";
+
+  src = fetchurl {
+    url = "http://www.andre-simon.de/zip/${name}.tar.bz2";
+    sha256 = "18f2ki9pajxlp0aq4ingxj7m0cp7wlbc40xm25pnxc1yis9vlira";
+  };
+
+  buildInputs = [getopt];
+
+  makeFlags = ["PREFIX=$out"];
+
+  meta = {
+    description = "Source code highlighting tool";
+  };
+}