Unverified Commit 46be72d3 authored by Johannes Kirschbauer's avatar Johannes Kirschbauer
Browse files

nixos/unitOption: remove unnecessary definition filtering

parent 94d09d10

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 = {