nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-02 15:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Moved the functions for option processing to lib.

Browse Source 
svn path=/nixpkgs/trunk/; revision=9616
This commit is contained in:
Eelco Dolstra 2007-11-09 18:05:32 +00:00
parent 15e2d9c304
commit b5f893d92a
2 changed files with 30 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/lib/default.nix
View File

@ -201,4 +201,34 @@ rec {
else condConcat
name (tail (tail list)) checker;
/* Options. */
mkOption = attrs: attrs // {_type = "option";};
typeOf = x: if x ? _type then x._type else "";
fillOptionsDefaults = defs: opts: opts //
builtins.listToAttrs (map (defName:
{ name = defName;
value =
let
defValue = builtins.getAttr defName defs;
optValue = builtins.getAttr defName opts;
in
if typeOf defValue == "option"
then
# `defValue' is an option.
if builtins.hasAttr defName opts
then builtins.getAttr defName opts
else defValue.default
else
# `defValue' is an attribute set containing options.
# So recurse.
if builtins.hasAttr defName opts && builtins.isAttrs optValue
then fillOptionsDefaults defValue optValue
else fillOptionsDefaults defValue {};
}
) (builtins.attrNames defs));
}

100
pkgs/lib/options.nix
View File

@ -1,100 +0,0 @@
let
mkOption = attrs: attrs // {_type = "option";};
typeOf = x: if x ? _type then x._type else "";
combine = defs: opts: opts //
builtins.listToAttrs (map (defName:
{ name = defName;
value =
let
defValue = builtins.getAttr defName defs;
optValue = builtins.getAttr defName opts;
in
if typeOf defValue == "option"
then
# `defValue' is an option.
if builtins.hasAttr defName opts
then builtins.getAttr defName opts
else defValue.default
else
# `defValue' is an attribute set containing options.
# So recurse.
if builtins.hasAttr defName opts && builtins.isAttrs optValue
then combine defValue optValue
else combine defValue {};
}
) (builtins.attrNames defs));
testDefs = {
time = {
timeZone = mkOption {
default = "CET";
example = "America/New_York";
description = "The time zone used when displaying times and dates.";
};
};
boot = {
kernelModules = mkOption {
default = ["mod1"];
description = "
The set of kernel modules to be loaded in the second stage of
the boot process. That is, these modules are not included in
the initial ramdisk, so they'd better not be required for
mounting the root file system. Add them to
<option>boot.initrd.extraKernelModules</option> if they are.
";
};
initrd = {
kernelModules = mkOption {
default = [
"ahci"
"ata_piix"
"pata_marvell"
"sd_mod"
"sr_mod"
"ide-cd"
"ide-disk"
"ide-generic"
"ext3"
# Support USB keyboards, in case the boot fails and we only have
# a USB keyboard.
"ehci_hcd"
"ohci_hcd"
"usbhid"
];
description = "
The set of kernel modules in the initial ramdisk used during the
boot process.
";
};
};
};
};
testOpts = {
/*
time = {
timeZone = "UTC";
};
*/
boot = {
initrd = {
kernelModules = ["foo"];
extraKernelModules = ["bar"];
};
};
};
in (combine testDefs testOpts).boot.initrd.kernelModules