Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e6f6885da2ec
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9c0577447cdb
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on May 28, 2017

  1. locate: fix creation of the parent directory of of locate database

    @romildo
    romildo committed May 28, 2017
    Copy the full SHA
    c06a10e View commit details

  2. locate: does not use localuser for mlocate

    @romildo
    romildo committed May 28, 2017
    Copy the full SHA
    6ef6484 View commit details

Commits on Jun 10, 2017

  1. Merge pull request #26191 from romildo/fix.mlocate 

    locate: fix creation of parent dir of database
    @Mic92
    Mic92 authored Jun 10, 2017
    Copy the full SHA
    9c05774 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 nixos/modules/misc/locate.nix
4 changes: 2 additions & 2 deletions nixos/modules/misc/locate.nix
View file
Original file line number Diff line number Diff line change
@@ -131,9 +131,9 @@ in {
path = mkIf (!isMLocate) [ pkgs.su ];
script =
''
install -m ${if isMLocate then "0750" else "0755"} -o root -g ${if isMLocate then "mlocate" else "root"} -d $(dirname ${cfg.output})
mkdir -m 0755 -p ${dirOf cfg.output}
exec ${cfg.locate}/bin/updatedb \
${optionalString (cfg.localuser != null) ''--localuser=${cfg.localuser}''} \
${optionalString (cfg.localuser != null && ! isMLocate) ''--localuser=${cfg.localuser}''} \
--output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags}
'';
environment = {