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

Merge pull request #2283 from wizeman/u/sysctl-merge

Browse Source 
nixos: Fix sysctl option merging
This commit is contained in:
Michael Raskin 2014-06-30 09:03:33 +04:00
commit f2e9ebbd46
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/config/sysctl.nix
View File

@ -6,8 +6,12 @@ let
sysctlOption = mkOptionType { sysctlOption = mkOptionType {
name = "sysctl option value"; name = "sysctl option value";
check = x: isBool x || isString x || isInt x || isNull x; check = val:
merge = args: defs: (last defs).value; # FIXME: hacky way to allow overriding in configuration.nix. let
checkType = x: isBool x || isString x || isInt x || isNull x;
in
checkType val || (val._type or "" == "override" && checkType val.content);
merge = loc: defs: mergeOneOption loc (filterOverrides defs);
}; };
in in