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

Replace mkOverride by its alias mkOverrideTemplate to remove the unused

Browse Source 
template argument of mkOverride later.

svn path=/nixos/trunk/; revision=23631
This commit is contained in:
Nicolas Pierron 2010-09-03 19:10:59 +00:00
parent 1f69bc4b9d
commit c9dc3651da
13 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/installer/cd-dvd/installation-cd-base.nix
View File

@ -247,9 +247,9 @@ 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.sshd.startOn = pkgs.lib.mkOverride 50 {} ""; jobs.sshd.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
# Enable wpa_supplicant, but don't start it by default. # Enable wpa_supplicant, but don't start it by default.
networking.enableWLAN = true; networking.enableWLAN = true;
jobs.wpa_supplicant.startOn = pkgs.lib.mkOverride 50 {} ""; jobs.wpa_supplicant.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
} }

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

@ -174,5 +174,5 @@ 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.sshd.startOn = pkgs.lib.mkOverride 50 {} ""; jobs.sshd.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
} }

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

@ -35,7 +35,7 @@ in
# overriden by the user's configuration). # overriden 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 = mkOverride 900 "kde4"; # services.xserver.desktopManager.default = mkOverrideTemplate 900 "kde4";
services.xserver.desktopManager.session = singleton services.xserver.desktopManager.session = singleton
{ name = "kde4"; { name = "kde4";

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

@ -5,9 +5,9 @@
with pkgs.lib; with pkgs.lib;
{ {
boot.loader.grub.device = mkOverride 0 {} ""; boot.loader.grub.device = mkOverrideTemplate 0 {} "";
# undefined the obsolete name of the previous option. # undefined the obsolete name of the previous option.
boot.grubDevice = mkOverride 0 {} pkgs.lib.mkNotdef; boot.grubDevice = mkOverrideTemplate 0 {} pkgs.lib.mkNotdef;
nesting.children = mkOverride 0 {} []; nesting.children = mkOverrideTemplate 0 {} [];
nesting.clone = mkOverride 0 {} []; nesting.clone = mkOverrideTemplate 0 {} [];
} }

4
modules/testing/test-instrumentation.nix
View File

@ -78,8 +78,8 @@ in
services.syslogd.extraConfig = "*.* /dev/ttyS0"; services.syslogd.extraConfig = "*.* /dev/ttyS0";
# Prevent tests from accessing the Internet. # Prevent tests from accessing the Internet.
networking.defaultGateway = mkOverride 150 {} ""; networking.defaultGateway = mkOverrideTemplate 150 {} "";
networking.nameservers = mkOverride 150 {} [ ]; networking.nameservers = mkOverrideTemplate 150 {} [ ];
# Require a patch to the kernel to increase the 15s CIFS timeout. # Require a patch to the kernel to increase the 15s CIFS timeout.
assertions = assertions =

14
modules/virtualisation/qemu-vm.nix
View File

@ -232,12 +232,12 @@ in
virtualisation.pathsInNixDB = [ config.system.build.toplevel ]; virtualisation.pathsInNixDB = [ config.system.build.toplevel ];
# Mount the host filesystem via CIFS, and bind-mount the Nix store # Mount the host filesystem via CIFS, and bind-mount the Nix store
# of the host into our own filesystem. We use mkOverride to allow # of the host into our own filesystem. We use mkOverrideTemplate to allow
# this module to be applied to "normal" NixOS system configuration, # this module to be applied to "normal" NixOS system configuration,
# where the regular value for the `fileSystems' attribute should be # where the regular value for the `fileSystems' attribute should be
# disregarded for the purpose of building a VM test image (since # disregarded for the purpose of building a VM test image (since
# those filesystems don't exist in the VM). # those filesystems don't exist in the VM).
fileSystems = mkOverride 50 {} fileSystems = mkOverrideTemplate 50 {}
[ { mountPoint = "/"; [ { mountPoint = "/";
device = "/dev/vda"; device = "/dev/vda";
} }
@ -259,7 +259,7 @@ in
# host filesystem and thus deadlocks the system. # host filesystem and thus deadlocks the system.
networking.useDHCP = false; networking.useDHCP = false;
networking.defaultGateway = mkOverride 200 {} "10.0.2.2"; networking.defaultGateway = mkOverrideTemplate 200 {} "10.0.2.2";
networking.nameservers = [ "10.0.2.3" ]; networking.nameservers = [ "10.0.2.3" ];
@ -287,9 +287,9 @@ in
# When building a regular system configuration, override whatever # When building a regular system configuration, override whatever
# video driver the host uses. # video driver the host uses.
services.xserver.videoDriver = mkOverride 50 {} null; services.xserver.videoDriver = mkOverrideTemplate 50 {} null;
services.xserver.videoDrivers = mkOverride 50 {} [ "cirrus" "vesa" ]; services.xserver.videoDrivers = mkOverrideTemplate 50 {} [ "cirrus" "vesa" ];
services.xserver.defaultDepth = mkOverride 50 {} 0; services.xserver.defaultDepth = mkOverrideTemplate 50 {} 0;
services.xserver.monitorSection = services.xserver.monitorSection =
'' ''
# Set a higher refresh rate so that resolutions > 800x600 work. # Set a higher refresh rate so that resolutions > 800x600 work.
@ -300,5 +300,5 @@ in
services.mingetty.ttys = ttys ++ optional (!cfg.graphics) "ttyS0"; services.mingetty.ttys = ttys ++ optional (!cfg.graphics) "ttyS0";
# Wireless won't work in the VM. # Wireless won't work in the VM.
networking.enableWLAN = mkOverride 50 {} false; networking.enableWLAN = mkOverrideTemplate 50 {} false;
} }

2
tests/check-filesystems.nix
View File

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

2
tests/installer.nix
View File

@ -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 = mkOverride 0 {} 0; boot.loader.grub.timeout = mkOverrideTemplate 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.

2
tests/nfs.nix
View File

@ -4,7 +4,7 @@ let
client = client =
{ config, pkgs, ... }: { config, pkgs, ... }:
{ fileSystems = pkgs.lib.mkOverride 50 {} { fileSystems = pkgs.lib.mkOverrideTemplate 50 {}
[ { mountPoint = "/data"; [ { mountPoint = "/data";
device = "server:/data"; device = "server:/data";
fsType = "nfs"; fsType = "nfs";

2
tests/quake3.nix
View File

@ -7,7 +7,7 @@ rec {
{ require = [ ./common/x11.nix ]; { require = [ ./common/x11.nix ];
services.xserver.driSupport = true; services.xserver.driSupport = true;
services.xserver.defaultDepth = pkgs.lib.mkOverride 0 {} 16; services.xserver.defaultDepth = pkgs.lib.mkOverrideTemplate 0 {} 16;
environment.systemPackages = [ pkgs.icewm pkgs.quake3demo ]; environment.systemPackages = [ pkgs.icewm pkgs.quake3demo ];
}; };

2
tests/test-nixos-install-from-cd/configuration-iso.nix
View File

@ -5,7 +5,7 @@
{pkgs, config, ...}: {pkgs, config, ...}:
let let
doOverride = pkgs.lib.mkOverride 0 {}; doOverride = pkgs.lib.mkOverrideTemplate 0 {};
in in
{ {

2
tests/test-nixos-install-from-cd/module-insecure.nix
View File

@ -6,7 +6,7 @@
{pkgs, config, ...}: {pkgs, config, ...}:
let let
doOverride = pkgs.lib.mkOverride 0 {}; doOverride = pkgs.lib.mkOverrideTemplate 0 {};
in in
{ {

2
tests/trac.nix
View File

@ -31,7 +31,7 @@
webserver = webserver =
{config, pkgs, ...}: {config, pkgs, ...}:
{ {
fileSystems = pkgs.lib.mkOverride 50 {} fileSystems = pkgs.lib.mkOverrideTemplate 50 {}
[ { mountPoint = "/repos"; [ { mountPoint = "/repos";
device = "storage:/repos"; } device = "storage:/repos"; }
]; ];