Updating from trunk.

I had to fix conflicts in the pcre expression, and as usual, all-packages.nix about stdenv2.


svn path=/nixos/branches/stdenv-updates/; revision=24153

release.nix

@@ -1,4 +1,4 @@
-{ nixpkgs ? ../nixpkgs }:
+{ nixpkgs ? ../stdenv-updates-svn }:
 
 let
 
@@ -66,6 +66,7 @@ let
             description = "NixOS system tarball for ${system} - ${stdenv.platform.name}";
             maintainers = map (x: lib.getAttr x lib.maintainers) maintainers;
           };
+          inherit config;
         };