From ff4e92f2cc96ce4b776fe5de21b54f9c2f897e52 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 3 Aug 2015 13:48:43 +0200 Subject: [PATCH] Spelling etc --- nixos/doc/manual/release-notes/rl-unstable.xml | 6 +++--- nixos/modules/misc/locate.nix | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index 7106690b82b..aedc85f3069 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -181,10 +181,10 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.cabal-install - The locate service no longer indexes the nix store + The locate service no longer indexes the Nix store by default, preventing packages with potentially numerous versions from - cluttering the output. Indexing the store can be activated with - services.locate.includeStore = true;. + cluttering the output. Indexing the store can be activated by setting + services.locate.includeStore = true. diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index bf05c460729..e85e390acb6 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -35,7 +35,7 @@ in { type = types.listOf types.str; default = [ ]; description = '' - Extra flags to append to updatedb. + Extra flags to pass to updatedb. ''; }; @@ -60,7 +60,7 @@ in { type = types.bool; default = false; description = '' - Whether to include /nix/store in the locate database. + Whether to include /nix/store in the locate database. ''; }; @@ -78,9 +78,9 @@ in { '' mkdir -m 0755 -p $(dirname ${toString cfg.output}) exec updatedb \ - --localuser=${cfg.localuser} \ - ${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \ - --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags} + --localuser=${cfg.localuser} \ + ${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \ + --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags} ''; serviceConfig.Nice = 19; serviceConfig.IOSchedulingClass = "idle";