Unverified Commit 6d8eca96 authored by Johannes Kirschbauer's avatar Johannes Kirschbauer
Browse files

sysctl: remove unnecessary definition filtering

parent 46be72d3

nixos/modules/config/sysctl.nix

+2 −4
Original line number Diff line number Diff line
@@ -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 {