Unverified Commit ac5a33bd authored by Johannes Kirschbauer's avatar Johannes Kirschbauer Committed by GitHub
Browse files

nixos/unitOption: remove unnecessary definition filtering (#412468)

parents 91b61e97 6d8eca96

nixos/lib/systemd-unit-options.nix

+3 −7
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ let 
  inherit (lib)

    any

    concatMap

    filterOverrides

    isList

    literalExpression

    mergeEqualOption
@@ -56,13 +55,10 @@ rec { 
    name = "systemd option";

    merge =

      loc: defs:

      let

        defs' = filterOverrides defs;

      in

      if any (def: isList def.value) defs' then

        concatMap (def: toList def.value) defs'

      if any (def: isList def.value) defs then

        concatMap (def: toList def.value) defs

      else

        mergeEqualOption loc defs';

        mergeEqualOption loc defs;

  };



  sharedOptions = {

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 {