From b9df4311dc1f50253ec86be6b7908fa620070ffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 23 May 2016 19:50:25 +0200 Subject: [PATCH] man-db: make it the default man provider For now, leave the old implementation under `man-old` attribute. Small warning: I had a leftover ~/.nix-profile/man from an old package, which caused man-db's man prefer it and ignore ~/.nix-profile/share/man. The PATH->MANPATH code just selects the first match for each PATH item. --- nixos/modules/programs/man.nix | 2 +- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/programs/man.nix b/nixos/modules/programs/man.nix index 201144ccb45..e59ffd6f936 100644 --- a/nixos/modules/programs/man.nix +++ b/nixos/modules/programs/man.nix @@ -19,7 +19,7 @@ with lib; config = mkIf config.programs.man.enable { - environment.systemPackages = [ pkgs.man ]; + environment.systemPackages = [ pkgs.man-db ]; environment.pathsToLink = [ "/share/man" ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fb1b3571e37..a6b312619c9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -64,6 +64,8 @@ doNotDisplayTwice rec { lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 manpages = man-pages; # added 2015-12-06 + man_db = man-db; # added 2016-05 + man = man-db; # added 2016-05 midoriWrapper = midori; # added 2015-01 mlt-qt5 = qt5.mlt; # added 2015-12-19 module_init_tools = kmod; # added 2016-04-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24b56ef5d75..3f882ce1654 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2379,9 +2379,9 @@ in makemkv = callPackage ../applications/video/makemkv { }; - man = callPackage ../tools/misc/man { }; + man-old = callPackage ../tools/misc/man { }; - man_db = callPackage ../tools/misc/man-db { }; + man-db = callPackage ../tools/misc/man-db { }; mawk = callPackage ../tools/text/mawk { };