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

switched all mergeOptionString to pkgs.lib.types.string

Browse Source 
pierron recommended the use of types.string over mergeOptionString, as
it is superior but might break things.

For my system the change evaluated to the exactly same.

svn path=/nixos/trunk/; revision=31138
This commit is contained in:
Florian Friesdorf 2011-12-29 00:51:35 +00:00
parent 3ebc7727f7
commit eb755d4692
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/programs/bash/bash.nix
View File

@ -15,7 +15,7 @@ let
description = " description = "
Script used to initialized user shell environments. Script used to initialized user shell environments.
"; ";
merge = mergeStringOption; type = with pkgs.lib.types; string;
}; };
}; };

2
modules/services/hardware/udev.nix
View File

@ -170,7 +170,7 @@ in
example = '' example = ''
KERNEL=="eth*", ATTR{address}=="00:1D:60:B9:6D:4F", NAME="my_fast_network_card" KERNEL=="eth*", ATTR{address}=="00:1D:60:B9:6D:4F", NAME="my_fast_network_card"
''; '';
merge = mergeStringOption; type = with pkgs.lib.types; string;
description = '' description = ''
Additional <command>udev</command> rules. They'll be written Additional <command>udev</command> rules. They'll be written
into file <filename>10-local.rules</filename>. Thus they are into file <filename>10-local.rules</filename>. Thus they are

2
modules/services/misc/nix-daemon.nix
View File

@ -171,7 +171,7 @@ in
envVars = mkOption { envVars = mkOption {
internal = true; internal = true;
default = ""; default = "";
merge = mergeStringOption; type = with pkgs.lib.types; string;
description = " description = "
Environment variables used by Nix. Environment variables used by Nix.
"; ";

10
modules/system/boot/stage-1.nix
View File

@ -37,7 +37,7 @@ let
boot.initrd.preLVMCommands = mkOption { boot.initrd.preLVMCommands = mkOption {
default = ""; default = "";
merge = mergeStringOption; type = with types; string;
description = '' description = ''
Shell commands to be executed immediately before lvm discovery. Shell commands to be executed immediately before lvm discovery.
''; '';
@ -45,7 +45,7 @@ let
boot.initrd.postDeviceCommands = mkOption { boot.initrd.postDeviceCommands = mkOption {
default = ""; default = "";
merge = mergeStringOption; type = with types; string;
description = '' description = ''
Shell commands to be executed immediately after stage 1 of the Shell commands to be executed immediately after stage 1 of the
boot has loaded kernel modules and created device nodes in boot has loaded kernel modules and created device nodes in
@ -55,7 +55,7 @@ let
boot.initrd.postMountCommands = mkOption { boot.initrd.postMountCommands = mkOption {
default = ""; default = "";
merge = mergeStringOption; type = with types; string;
description = '' description = ''
Shell commands to be executed immediately after the stage 1 Shell commands to be executed immediately after the stage 1
filesystems have been mounted. filesystems have been mounted.
@ -65,7 +65,7 @@ let
boot.initrd.extraUtilsCommands = mkOption { boot.initrd.extraUtilsCommands = mkOption {
internal = true; internal = true;
default = ""; default = "";
merge = mergeStringOption; type = with types; string;
description = '' description = ''
Shell commands to be executed in the builder of the Shell commands to be executed in the builder of the
extra-utils derivation. This can be used to provide extra-utils derivation. This can be used to provide
@ -76,7 +76,7 @@ let
boot.initrd.extraUtilsCommandsTest = mkOption { boot.initrd.extraUtilsCommandsTest = mkOption {
internal = true; internal = true;
default = ""; default = "";
merge = mergeStringOption; type = with types; string;
description = '' description = ''
Shell commands to be executed in the builder of the Shell commands to be executed in the builder of the
extra-utils derivation after patchelf has done its extra-utils derivation after patchelf has done its

2
modules/system/boot/stage-2.nix
View File

@ -8,7 +8,7 @@ let
postBootCommands = pkgs.lib.mkOption { postBootCommands = pkgs.lib.mkOption {
default = ""; default = "";
example = "rm -f /var/log/messages"; example = "rm -f /var/log/messages";
merge = pkgs.lib.mergeStringOption; type = with pkgs.lib.types; string;
description = '' description = ''
Shell commands to be executed just before Upstart is started. Shell commands to be executed just before Upstart is started.
''; '';