lol

Factor out "man" into a separate module and add "man" outputs to system.path

Fixes #10270.

+35 -5
-3
nixos/modules/config/system-path.nix
··· 28 28 pkgs.xz 29 29 pkgs.less 30 30 pkgs.libcap 31 - pkgs.man 32 31 pkgs.nano 33 32 pkgs.ncurses 34 33 pkgs.netcat ··· 106 105 "/info" 107 106 "/lib" # FIXME: remove 108 107 #"/lib/debug/.build-id" # enables GDB to find separated debug info 109 - "/man" 110 108 "/sbin" 111 109 "/share/applications" 112 110 "/share/desktop-directories" ··· 114 112 "/share/emacs" 115 113 "/share/icons" 116 114 "/share/info" 117 - "/share/man" 118 115 "/share/menus" 119 116 "/share/mime" 120 117 "/share/nano"
+2 -1
nixos/modules/module-list.nix
··· 61 61 ./programs/command-not-found/command-not-found.nix 62 62 ./programs/dconf.nix 63 63 ./programs/environment.nix 64 + ./programs/freetds.nix 64 65 ./programs/ibus.nix 65 66 ./programs/kbdlight.nix 66 67 ./programs/light.nix 68 + ./programs/man.nix 67 69 ./programs/nano.nix 68 70 ./programs/screen.nix 69 71 ./programs/shadow.nix ··· 73 75 ./programs/uim.nix 74 76 ./programs/venus.nix 75 77 ./programs/wvdial.nix 76 - ./programs/freetds.nix 77 78 ./programs/xfs_quota.nix 78 79 ./programs/zsh/zsh.nix 79 80 ./rename.nix
+30
nixos/modules/programs/man.nix
··· 1 + { config, lib, pkgs, ... }: 2 + 3 + with lib; 4 + 5 + { 6 + 7 + options = { 8 + 9 + programs.man.enable = mkOption { 10 + type = types.bool; 11 + default = true; 12 + description = '' 13 + Whether to enable manual pages and the <command>man</command> command. 14 + ''; 15 + }; 16 + 17 + }; 18 + 19 + 20 + config = mkIf config.programs.man.enable { 21 + 22 + environment.systemPackages = [ pkgs.man ]; 23 + 24 + environment.pathsToLink = [ "/share/man" ]; 25 + 26 + environment.outputsToLink = [ "man" ]; 27 + 28 + }; 29 + 30 + }
+3 -1
nixos/modules/services/misc/nixos-manual.nix
··· 92 92 93 93 system.build.manual = manual; 94 94 95 - environment.systemPackages = [ manual.manpages manual.manual help ]; 95 + environment.systemPackages = 96 + [ manual.manual help ] 97 + ++ optional config.programs.man.enable manual.manpages; 96 98 97 99 boot.extraTTYs = mkIf cfg.showManual ["tty${cfg.ttyNumber}"]; 98 100