diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix index 45f25180e07b..6489b406b2c7 100644 --- a/nixos/modules/config/sysctl.nix +++ b/nixos/modules/config/sysctl.nix @@ -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 {