Remove remaining uses of mkOverrideTemplate

Changed files
+9 -11
nixos
+1 -1
nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
···
# default root password is empty.
services.openssh.enable = true;
-
jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
boot.loader.grub.enable = false;
boot.loader.generationsDir.enable = false;
···
# default root password is empty.
services.openssh.enable = true;
+
jobs.openssh.startOn = pkgs.lib.mkOverride 50 "";
boot.loader.grub.enable = false;
boot.loader.generationsDir.enable = false;
+1 -1
nixos/modules/installer/cd-dvd/system-tarball-pc.nix
···
# not be started by default on the installation CD because the
# default root password is empty.
services.openssh.enable = true;
-
jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
# To be able to use the systemTarball to catch troubles.
boot.crashDump = {
···
# not be started by default on the installation CD because the
# default root password is empty.
services.openssh.enable = true;
+
jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 "";
# To be able to use the systemTarball to catch troubles.
boot.crashDump = {
+1 -1
nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
···
# not be started by default on the installation CD because the
# default root password is empty.
services.openssh.enable = true;
-
jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
# cpufrequtils fails to build on non-pc
powerManagement.enable = false;
···
# not be started by default on the installation CD because the
# default root password is empty.
services.openssh.enable = true;
+
jobs.openssh.startOn = pkgs.lib.mkOverride 50 "";
# cpufrequtils fails to build on non-pc
powerManagement.enable = false;
+1 -1
nixos/modules/services/x11/desktop-managers/kde4.nix
···
# overridden by the user's configuration).
# !!! doesn't work yet ("Multiple definitions. Only one is allowed
# for this option.")
-
# services.xserver.desktopManager.default = mkOverrideTemplate 900 "kde4";
services.xserver.desktopManager.session = singleton
{ name = "kde4";
···
# overridden by the user's configuration).
# !!! doesn't work yet ("Multiple definitions. Only one is allowed
# for this option.")
+
# services.xserver.desktopManager.default = mkOverride 900 "kde4";
services.xserver.desktopManager.session = singleton
{ name = "kde4";
+3 -5
nixos/modules/system/activation/no-clone.nix
···
-
# This configuration is not made to figure inside the module-list.nix to
-
# allow clone of the first level.
{pkgs, ...}:
with pkgs.lib;
{
-
boot.loader.grub.device = mkOverrideTemplate 0 {} "nodev";
-
nesting.children = mkOverrideTemplate 0 {} [];
-
nesting.clone = mkOverrideTemplate 0 {} [];
}
···
{pkgs, ...}:
with pkgs.lib;
{
+
boot.loader.grub.device = mkOverride 0 "nodev";
+
nesting.children = mkOverride 0 [];
+
nesting.clone = mkOverride 0 [];
}
+1 -1
nixos/tests/check-filesystems.nix
···
device = "share:/repos2";
fsType = "nfs";
};
-
in pkgs.lib.mkOverrideTemplate 50 {} [
repos1
repos1 # check remount
repos2 # check after remount
···
device = "share:/repos2";
fsType = "nfs";
};
+
in pkgs.lib.mkOverride 50 [
repos1
repos1 # check remount
repos2 # check after remount
+1 -1
nixos/tests/installer.nix
···
[ ../modules/installer/cd-dvd/installation-cd-graphical.nix
../modules/testing/test-instrumentation.nix
{ key = "serial";
-
boot.loader.grub.timeout = mkOverrideTemplate 0 {} 0;
# The test cannot access the network, so any sources we
# need must be included in the ISO.
···
[ ../modules/installer/cd-dvd/installation-cd-graphical.nix
../modules/testing/test-instrumentation.nix
{ key = "serial";
+
boot.loader.grub.timeout = mkOverride 0 0;
# The test cannot access the network, so any sources we
# need must be included in the ISO.