Merge branch 'staging'

Darwin isn't in a perfect state, in particular its bootstrap tools won't
build which will block nixpkgs channel. But on the whole it seems
acceptable.

pkgs/development/python-modules/generic/wrap.sh

@@ -28,8 +28,10 @@ wrapPythonProgramsIn() {
     # Find all regular files in the output directory that are executable.
     for f in $(find "$dir" -type f -perm -0100); do
         # Rewrite "#! .../env python" to "#! /nix/store/.../python".
+        # Strip suffix, like "3" or "2.7m" -- we don't have any choice on which
+        # Python to use besides one in $python anyway.
         if head -n1 "$f" | grep -q '#!.*/env.*\(python\|pypy\)'; then
-            sed -i "$f" -e "1 s^.*/env[ ]*\(python\|pypy\)^#! $python^"
+            sed -i "$f" -e "1 s^.*/env[ ]*\(python\|pypy\)[^ ]*^#! $python^"
         fi
 
         # catch /python and /.python-wrapped

pkgs/development/python-modules/stringtemplate/default.nix

@@ -3,15 +3,22 @@
 stdenv.mkDerivation rec {
   name = "PyStringTemplate-${version}";
   version = "3.2b1";
-  meta = {
-    homepage = "http://www.stringtemplate.org/";
-    description = "Text Templating Library";
-  };
+
   src = fetchurl {
     url = "http://www.stringtemplate.org/download/${name}.tar.gz";
     sha256 = "0lbib0l8c1q7i1j610rwcdagymr1idahrql4dkgnm5rzyg2vk3ml";
   };
+
   propagatedBuildInputs = [python antlr];
-  buildPhase = "true";
-  installPhase = "python setup.py install --prefix=$out --install-lib=$(toPythonPath $out) -O1";
+
+  dontBuild = true;
+
+  installPhase = ''
+    python setup.py install --prefix=$out --install-lib=$(toPythonPath $out) -O1
+  '';
+
+  meta = {
+    homepage = "http://www.stringtemplate.org/";
+    description = "Text Templating Library";
+  };
 }