colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove remaining uses of mkOverrideTemplate

Browse Source
This commit is contained in:
Eelco Dolstra 2013-10-28 20:08:28 +01:00
parent 621f4c42f5
commit 30a36f9a80
7 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
View File

@ -152,7 +152,7 @@ in
# default root password is empty.
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.generationsDir.enable = false;

2
nixos/modules/installer/cd-dvd/system-tarball-pc.nix
View File

@ -109,7 +109,7 @@ in
# 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 {} "";
jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 "";
# To be able to use the systemTarball to catch troubles.
boot.crashDump = {

2
nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
View File

@ -165,7 +165,7 @@ in
# 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 {} "";
jobs.openssh.startOn = pkgs.lib.mkOverride 50 "";
# cpufrequtils fails to build on non-pc
powerManagement.enable = false;

2
nixos/modules/services/x11/desktop-managers/kde4.nix
View File

@ -80,7 +80,7 @@ in
# 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.default = mkOverride 900 "kde4";
services.xserver.desktopManager.session = singleton
{ name = "kde4";

8
nixos/modules/system/activation/no-clone.nix
View File

@ -1,11 +1,9 @@
# 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 {} [];
boot.loader.grub.device = mkOverride 0 "nodev";
nesting.children = mkOverride 0 [];
nesting.clone = mkOverride 0 [];
}

2
nixos/tests/check-filesystems.nix
View File

@ -40,7 +40,7 @@ rec {
device = "share:/repos2";
fsType = "nfs";
};
in pkgs.lib.mkOverrideTemplate 50 {} [
in pkgs.lib.mkOverride 50 [
repos1
repos1 # check remount
repos2 # check after remount

2
nixos/tests/installer.nix
View File

@ -14,7 +14,7 @@ let
[ ../modules/installer/cd-dvd/installation-cd-graphical.nix
../modules/testing/test-instrumentation.nix
{ 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
# need must be included in the ISO.