* substitute: support patterns starting with a dash.

* Updated the kernel headers.
* ghc: setup hooks are now generated using substituteAll.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10838

pkgs/tools/text/replace/default.nix

@@ -1,6 +1,6 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation ({
+stdenv.mkDerivation {
   name = "replace-2.24";
 
   src = fetchurl {
@@ -12,8 +12,10 @@ stdenv.mkDerivation ({
 
   postInstall = "mv \$out/bin/replace \$out/bin/replace-literal";
 
+  patches = [./malloc.patch];
+
   meta = {
     homepage = http://replace.richardlloyd.org.uk/;
     description = "A tool to replace verbatim strings";
   };
-} // (if stdenv.system == "i686-darwin" then {patches = [./malloc.patch];} else {}))
+}