commit 46be72d31539780a988f60b3a5f46bc3726d9bad · pyrox.dev/nixpkgs

+3 -7
nixos/lib/systemd-unit-options.nix
···

       15
       15
        
         inherit (lib)

     

       16
       16
        
           any

     

       17
       17
        
           concatMap

     

       18
       18
       -
           filterOverrides

     

       19
       18
        
           isList

     

       20
       19
        
           literalExpression

     

       21
       20
        
           mergeEqualOption

     
···

       56
       55
        
           name = "systemd option";

     

       57
       56
        
           merge =

     

       58
       57
        
             loc: defs:

     

       59
       59
       -
             let

     

       60
       60
       -
               defs' = filterOverrides defs;

     

       61
       61
       -
             in

     

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

     

       63
       63
       -
               concatMap (def: toList def.value) defs'

     

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

     

       59
       59
       +
               concatMap (def: toList def.value) defs

     

       64
       60
        
             else

     

       65
       65
       -
               mergeEqualOption loc defs';

     

       61
       61
       +
               mergeEqualOption loc defs;

     

       66
       62
        
         };

     

       67
       63
        
       

     

       68
       64
        
         sharedOptions = {