From 3dcd0cc7a4e509b807a031ade5b52f379297df48 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Feb 2008 12:43:38 +0000
Subject: [PATCH] * stdenvUsingSetupNew2 -> stdenv.

svn path=/nixos/trunk/; revision=10850
---
 upstart-jobs/apache-httpd/dist-manager.nix | 2 +-
 upstart-jobs/apache-httpd/subversion.nix   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/upstart-jobs/apache-httpd/dist-manager.nix b/upstart-jobs/apache-httpd/dist-manager.nix
index a6523c73214..e4aca9324aa 100644
--- a/upstart-jobs/apache-httpd/dist-manager.nix
+++ b/upstart-jobs/apache-httpd/dist-manager.nix
@@ -30,7 +30,7 @@ let
   };
 
   # !!! cut&paste
-  substituteInAll = args: pkgs.stdenvUsingSetupNew2.mkDerivation ({
+  substituteInAll = args: pkgs.stdenv.mkDerivation ({
     buildCommand = ''
       ensureDir $out
       cp -prd $src/* $out
diff --git a/upstart-jobs/apache-httpd/subversion.nix b/upstart-jobs/apache-httpd/subversion.nix
index f11f1af77dc..32522c1c953 100644
--- a/upstart-jobs/apache-httpd/subversion.nix
+++ b/upstart-jobs/apache-httpd/subversion.nix
@@ -241,7 +241,7 @@ let
 
   
   # !!! should be in Nixpkgs.
-  substituteInSome = args: pkgs.stdenvUsingSetupNew2.mkDerivation ({
+  substituteInSome = args: pkgs.stdenv.mkDerivation ({
     buildCommand = ''
       ensureDir $out
       cp -prd $src/* $out
@@ -252,7 +252,7 @@ let
     '';
   } // args); # */
     
-  substituteInAll = args: pkgs.stdenvUsingSetupNew2.mkDerivation ({
+  substituteInAll = args: pkgs.stdenv.mkDerivation ({
     buildCommand = ''
       ensureDir $out
       cp -prd $src/* $out