movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-09 19:13:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

sysctl: remove unnecessary definition filtering

Browse source
This commit is contained in:
Johannes Kirschbauer 2025-05-30 22:45:46 +02:00
parent 46be72d315
commit 6d8eca96ba
No known key found for this signature in database
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/config/sysctl.nix
View file

@ -9,7 +9,7 @@ let
checkType = x: lib.isBool x || lib.isString x || lib.isInt x || x == null;
in
checkType val || (val._type or "" == "override" && checkType val.content);
merge = loc: defs: lib.mergeOneOption loc (lib.filterOverrides defs);
merge = loc: defs: lib.mergeOneOption loc defs;
};
in
@ -22,9 +22,7 @@ in
type =
let
highestValueType = lib.types.ints.unsigned // {
merge =
loc: defs:
lib.foldl (a: b: if b.value == null then null else lib.max a b.value) 0 (lib.filterOverrides defs);
merge = loc: defs: lib.foldl (a: b: if b.value == null then null else lib.max a b.value) 0 defs;
};
in
lib.types.submodule {