Unverified Commit 98edbf83 authored by Lin Jian's avatar Lin Jian Committed by GitHub
Browse files

Merge pull request #259009 from bobvanderlinden/pr-locate-package 

nixos/locate: rename option `locate` -> `package`
parents 35c640b1 423c86a7

nixos/modules/misc/locate.nix

+11 −10
Original line number Diff line number Diff line
@@ -4,14 +4,15 @@ with lib; 


let

  cfg = config.services.locate;

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

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

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

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

  isMorPLocate = isMLocate || isPLocate;

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

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

in

{

  imports = [

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

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

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

  ];
@@ -25,10 +26,10 @@ in 
      '';

    };



    locate = mkOption {

    package = mkOption {

      type = package;

      default = pkgs.findutils.locate;

      defaultText = literalExpression "pkgs.findutils";

      defaultText = literalExpression "pkgs.findutils.locate";

      example = literalExpression "pkgs.mlocate";

      description = lib.mdDoc ''

        The locate implementation to use
@@ -218,11 +219,11 @@ in 
        };

        mlocate = mkIf isMLocate {

          group = "mlocate";

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

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

        };

        plocate = mkIf isPLocate {

          group = "plocate";

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

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

        };

      in

      mkIf isMorPLocate {
@@ -230,7 +231,7 @@ in 
        plocate = mkIf isPLocate (mkMerge [ common plocate ]);

      };



    environment.systemPackages = [ cfg.locate ];

    environment.systemPackages = [ cfg.package ];



    environment.variables.LOCATE_PATH = cfg.output;
@@ -268,13 +269,13 @@ in 
            args = concatLists (map toFlags [ "pruneFS" "pruneNames" "prunePaths" ]);

          in

          ''

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

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

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

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

              ${concatStringsSep " " cfg.extraFlags}

          ''

        else ''

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

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

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

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

        '';