Remove remaining uses of mkOverrideTemplate
This commit is contained in:
parent
621f4c42f5
commit
30a36f9a80
|
@ -152,7 +152,7 @@ in
|
||||||
# default root password is empty.
|
# default root password is empty.
|
||||||
services.openssh.enable = true;
|
services.openssh.enable = true;
|
||||||
|
|
||||||
jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
|
jobs.openssh.startOn = pkgs.lib.mkOverride 50 "";
|
||||||
|
|
||||||
boot.loader.grub.enable = false;
|
boot.loader.grub.enable = false;
|
||||||
boot.loader.generationsDir.enable = false;
|
boot.loader.generationsDir.enable = false;
|
||||||
|
|
|
@ -109,7 +109,7 @@ in
|
||||||
# not be started by default on the installation CD because the
|
# not be started by default on the installation CD because the
|
||||||
# default root password is empty.
|
# default root password is empty.
|
||||||
services.openssh.enable = true;
|
services.openssh.enable = true;
|
||||||
jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
|
jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 "";
|
||||||
|
|
||||||
# To be able to use the systemTarball to catch troubles.
|
# To be able to use the systemTarball to catch troubles.
|
||||||
boot.crashDump = {
|
boot.crashDump = {
|
||||||
|
|
|
@ -165,7 +165,7 @@ in
|
||||||
# not be started by default on the installation CD because the
|
# not be started by default on the installation CD because the
|
||||||
# default root password is empty.
|
# default root password is empty.
|
||||||
services.openssh.enable = true;
|
services.openssh.enable = true;
|
||||||
jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
|
jobs.openssh.startOn = pkgs.lib.mkOverride 50 "";
|
||||||
|
|
||||||
# cpufrequtils fails to build on non-pc
|
# cpufrequtils fails to build on non-pc
|
||||||
powerManagement.enable = false;
|
powerManagement.enable = false;
|
||||||
|
|
|
@ -80,7 +80,7 @@ in
|
||||||
# overridden by the user's configuration).
|
# overridden by the user's configuration).
|
||||||
# !!! doesn't work yet ("Multiple definitions. Only one is allowed
|
# !!! doesn't work yet ("Multiple definitions. Only one is allowed
|
||||||
# for this option.")
|
# for this option.")
|
||||||
# services.xserver.desktopManager.default = mkOverrideTemplate 900 "kde4";
|
# services.xserver.desktopManager.default = mkOverride 900 "kde4";
|
||||||
|
|
||||||
services.xserver.desktopManager.session = singleton
|
services.xserver.desktopManager.session = singleton
|
||||||
{ name = "kde4";
|
{ name = "kde4";
|
||||||
|
|
|
@ -1,11 +1,9 @@
|
||||||
# This configuration is not made to figure inside the module-list.nix to
|
|
||||||
# allow clone of the first level.
|
|
||||||
{pkgs, ...}:
|
{pkgs, ...}:
|
||||||
|
|
||||||
with pkgs.lib;
|
with pkgs.lib;
|
||||||
|
|
||||||
{
|
{
|
||||||
boot.loader.grub.device = mkOverrideTemplate 0 {} "nodev";
|
boot.loader.grub.device = mkOverride 0 "nodev";
|
||||||
nesting.children = mkOverrideTemplate 0 {} [];
|
nesting.children = mkOverride 0 [];
|
||||||
nesting.clone = mkOverrideTemplate 0 {} [];
|
nesting.clone = mkOverride 0 [];
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,7 +40,7 @@ rec {
|
||||||
device = "share:/repos2";
|
device = "share:/repos2";
|
||||||
fsType = "nfs";
|
fsType = "nfs";
|
||||||
};
|
};
|
||||||
in pkgs.lib.mkOverrideTemplate 50 {} [
|
in pkgs.lib.mkOverride 50 [
|
||||||
repos1
|
repos1
|
||||||
repos1 # check remount
|
repos1 # check remount
|
||||||
repos2 # check after remount
|
repos2 # check after remount
|
||||||
|
|
|
@ -14,7 +14,7 @@ let
|
||||||
[ ../modules/installer/cd-dvd/installation-cd-graphical.nix
|
[ ../modules/installer/cd-dvd/installation-cd-graphical.nix
|
||||||
../modules/testing/test-instrumentation.nix
|
../modules/testing/test-instrumentation.nix
|
||||||
{ key = "serial";
|
{ key = "serial";
|
||||||
boot.loader.grub.timeout = mkOverrideTemplate 0 {} 0;
|
boot.loader.grub.timeout = mkOverride 0 0;
|
||||||
|
|
||||||
# The test cannot access the network, so any sources we
|
# The test cannot access the network, so any sources we
|
||||||
# need must be included in the ISO.
|
# need must be included in the ISO.
|
||||||
|
|
Loading…
Reference in a new issue