mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2025-01-04 01:42:53 +03:00
* Remove references to stdenvNew.
svn path=/nixos/trunk/; revision=7532
This commit is contained in:
parent
231b469188
commit
acacfda1b2
@ -238,7 +238,7 @@ rec {
|
|||||||
# kernel, the Upstart services, the init scripts, etc.) as well as a
|
# kernel, the Upstart services, the init scripts, etc.) as well as a
|
||||||
# script `switch-to-configuration' that activates the configuration
|
# script `switch-to-configuration' that activates the configuration
|
||||||
# and makes it bootable.
|
# and makes it bootable.
|
||||||
system = pkgs.stdenvNew.mkDerivation {
|
system = pkgs.stdenv.mkDerivation {
|
||||||
name = "system";
|
name = "system";
|
||||||
builder = ./system.sh;
|
builder = ./system.sh;
|
||||||
switchToConfiguration = ./switch-to-configuration.sh;
|
switchToConfiguration = ./switch-to-configuration.sh;
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
{
|
{
|
||||||
boot = {
|
boot = {
|
||||||
autoDetectRootDevice = false;
|
|
||||||
readOnlyRoot = false;
|
|
||||||
grubDevice = "/dev/hda";
|
grubDevice = "/dev/hda";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -21,8 +21,7 @@ let
|
|||||||
|
|
||||||
|
|
||||||
webServer = import ../services/apache-httpd {
|
webServer = import ../services/apache-httpd {
|
||||||
inherit (pkgs) apacheHttpd coreutils;
|
inherit (pkgs) stdenv apacheHttpd coreutils;
|
||||||
stdenv = pkgs.stdenvNew;
|
|
||||||
|
|
||||||
inherit hostName httpPort httpsPort
|
inherit hostName httpPort httpsPort
|
||||||
user group adminAddr logDir stateDir;
|
user group adminAddr logDir stateDir;
|
||||||
|
Loading…
Reference in New Issue
Block a user