From 87d614441d51da42d4d7102155e4535c64f8c1df Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Thu, 3 Dec 2020 21:57:09 +0100
Subject: [PATCH 1/2] nixos/documentation: silence man-db cache warnings
The output of the man-db command used to generate the caches is
irrelevant and can confuse users, let's hide it.
---
nixos/modules/misc/documentation.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix
index bc43cc33b5d..fe0263f158f 100644
--- a/nixos/modules/misc/documentation.nix
+++ b/nixos/modules/misc/documentation.nix
@@ -217,7 +217,7 @@ in
manualCache = pkgs.runCommandLocal "man-cache" { }
''
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
''
From 296c415030b29a29d10dd99a997622c27dbdce57 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Thu, 3 Dec 2020 22:00:33 +0100
Subject: [PATCH 2/2] nixos/fish: make generateCaches easier to override
---
nixos/modules/programs/fish.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix
index 39b92edf2ac..50d1077dd41 100644
--- a/nixos/modules/programs/fish.nix
+++ b/nixos/modules/programs/fish.nix
@@ -103,7 +103,7 @@ in
programs.fish.shellAliases = mapAttrs (name: mkDefault) cfge.shellAliases;
# 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/loginShellInit".text = cfge.loginShellInit;