* Remove references to stdenvNew.

svn path=/nixos/trunk/; revision=7532
This commit is contained in:
Eelco Dolstra 2007-01-04 10:21:25 +00:00
parent 231b469188
commit acacfda1b2
3 changed files with 2 additions and 5 deletions

View File

@ -238,7 +238,7 @@ rec {
# kernel, the Upstart services, the init scripts, etc.) as well as a
# script `switch-to-configuration' that activates the configuration
# and makes it bootable.
system = pkgs.stdenvNew.mkDerivation {
system = pkgs.stdenv.mkDerivation {
name = "system";
builder = ./system.sh;
switchToConfiguration = ./switch-to-configuration.sh;

View File

@ -1,7 +1,5 @@
{
boot = {
autoDetectRootDevice = false;
readOnlyRoot = false;
grubDevice = "/dev/hda";
};

View File

@ -21,8 +21,7 @@ let
webServer = import ../services/apache-httpd {
inherit (pkgs) apacheHttpd coreutils;
stdenv = pkgs.stdenvNew;
inherit (pkgs) stdenv apacheHttpd coreutils;
inherit hostName httpPort httpsPort
user group adminAddr logDir stateDir;