public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #105829 from rnhmjoj/man

Browse Source 
nixos/documentation: silence man-db cache warnings
This commit is contained in:
Michele Guerini Rocco 2020-12-03 23:30:49 +01:00 committed by GitHub
commit 41cb91fd89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/misc/documentation.nix
View File

@ -217,7 +217,7 @@ in
manualCache = pkgs.runCommandLocal "man-cache" { } manualCache = pkgs.runCommandLocal "man-cache" { }
'' ''
echo "MANDB_MAP ${manualPages}/share/man $out" > man.conf echo "MANDB_MAP ${manualPages}/share/man $out" > man.conf
${pkgs.man-db}/bin/mandb -C man.conf -psc ${pkgs.man-db}/bin/mandb -C man.conf -psc >/dev/null 2>&1
''; '';
in in
'' ''

2
nixos/modules/programs/fish.nix
View File

@ -103,7 +103,7 @@ in
programs.fish.shellAliases = mapAttrs (name: mkDefault) cfge.shellAliases; programs.fish.shellAliases = mapAttrs (name: mkDefault) cfge.shellAliases;
# Required for man completions # Required for man completions
documentation.man.generateCaches = true; documentation.man.generateCaches = lib.mkDefault true;
environment.etc."fish/foreign-env/shellInit".text = cfge.shellInit; environment.etc."fish/foreign-env/shellInit".text = cfge.shellInit;
environment.etc."fish/foreign-env/loginShellInit".text = cfge.loginShellInit; environment.etc."fish/foreign-env/loginShellInit".text = cfge.loginShellInit;