commit 423c86a70b5ba81639e1c66f9fe197814769e4d2 · pyrox.dev/nixpkgs

+11 -10
nixos/modules/misc/locate.nix
···

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
         cfg = config.services.locate;

     

       7
       7
       -
         isMLocate = hasPrefix "mlocate" cfg.locate.name;

     

       8
       8
       -
         isPLocate = hasPrefix "plocate" cfg.locate.name;

     

       7
       7
       +
         isMLocate = hasPrefix "mlocate" cfg.package.name;

     

       8
       8
       +
         isPLocate = hasPrefix "plocate" cfg.package.name;

     

       9
       9
        
         isMorPLocate = isMLocate || isPLocate;

     

       10
       10
       -
         isFindutils = hasPrefix "findutils" cfg.locate.name;

     

       10
       10
       +
         isFindutils = hasPrefix "findutils" cfg.package.name;

     

       11
       11
        
       in

     

       12
       12
        
       {

     

       13
       13
        
         imports = [

     

       14
       14
        
           (mkRenamedOptionModule [ "services" "locate" "period" ] [ "services" "locate" "interval" ])

     

       15
       15
       +
           (mkRenamedOptionModule [ "services" "locate" "locate" ] [ "services" "locate" "package" ])

     

       15
       16
        
           (mkRemovedOptionModule [ "services" "locate" "includeStore" ] "Use services.locate.prunePaths")

     

       16
       17
        
         ];

     

       17
       18
        
       

     
···

       25
       26
        
             '';

     

       26
       27
        
           };

     

       27
       28
        
       

     

       28
       28
       -
           locate = mkOption {

     

       29
       29
       +
           package = mkOption {

     

       29
       30
        
             type = package;

     

       30
       31
        
             default = pkgs.findutils.locate;

     

       31
       31
       -
             defaultText = literalExpression "pkgs.findutils";

     

       32
       32
       +
             defaultText = literalExpression "pkgs.findutils.locate";

     

       32
       33
        
             example = literalExpression "pkgs.mlocate";

     

       33
       34
        
             description = lib.mdDoc ''

     

       34
       35
        
               The locate implementation to use

     
···

       218
       219
        
               };

     

       219
       220
        
               mlocate = mkIf isMLocate {

     

       220
       221
        
                 group = "mlocate";

     

       221
       221
       -
                 source = "${cfg.locate}/bin/locate";

     

       222
       222
       +
                 source = "${cfg.package}/bin/locate";

     

       222
       223
        
               };

     

       223
       224
        
               plocate = mkIf isPLocate {

     

       224
       225
        
                 group = "plocate";

     

       225
       225
       -
                 source = "${cfg.locate}/bin/plocate";

     

       226
       226
       +
                 source = "${cfg.package}/bin/plocate";

     

       226
       227
        
               };

     

       227
       228
        
             in

     

       228
       229
        
             mkIf isMorPLocate {

     
···

       230
       231
        
               plocate = mkIf isPLocate (mkMerge [ common plocate ]);

     

       231
       232
        
             };

     

       232
       233
        
       

     

       233
       233
       -
           environment.systemPackages = [ cfg.locate ];

     

       234
       234
       +
           environment.systemPackages = [ cfg.package ];

     

       234
       235
        
       

     

       235
       236
        
           environment.variables.LOCATE_PATH = cfg.output;

     

       236
       237
        
       

     
···

       268
       269
        
                   args = concatLists (map toFlags [ "pruneFS" "pruneNames" "prunePaths" ]);

     

       269
       270
        
                 in

     

       270
       271
        
                 ''

     

       271
       271
       -
                   exec ${cfg.locate}/bin/updatedb \

     

       272
       272
       +
                   exec ${cfg.package}/bin/updatedb \

     

       272
       273
        
                     --output ${toString cfg.output} ${concatStringsSep " " args} \

     

       273
       274
        
                     --prune-bind-mounts ${if cfg.pruneBindMounts then "yes" else "no"} \

     

       274
       275
        
                     ${concatStringsSep " " cfg.extraFlags}

     

       275
       276
        
                 ''

     

       276
       277
        
               else ''

     

       277
       277
       -
                 exec ${cfg.locate}/bin/updatedb \

     

       278
       278
       +
                 exec ${cfg.package}/bin/updatedb \

     

       278
       279
        
                   ${optionalString (cfg.localuser != null && !isMorPLocate) "--localuser=${cfg.localuser}"} \

     

       279
       280
        
                   --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags}

     

       280
       281
        
               '';