From 3c6e5ef88e4b8296e648794f00d1f119d5ee095b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 7 Oct 2010 21:03:23 +0000
Subject: [PATCH] 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/release.nix b/release.nix
index dacbeab0cbe..8a48f46ad35 100644
--- a/release.nix
+++ b/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;
         };