diff options
| author | zimbatm <zimbatm@zimbatm.com> | 2016-05-24 09:25:10 +0100 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2016-05-24 09:25:10 +0100 |
| commit | 4d0a421f18cbb647af349d3a3bd7eceb534e57cc (patch) | |
| tree | 9b357d17f31cae050c0c1b4b5199b6004b2ea243 /pkgs/top-level | |
| parent | e50e376b2b1106d92ccf3c5cb643e1d3b64cb219 (diff) | |
| parent | 3472b61f371da6b38928f72e8def2809b86aab91 (diff) | |
| download | nixlib-4d0a421f18cbb647af349d3a3bd7eceb534e57cc.tar nixlib-4d0a421f18cbb647af349d3a3bd7eceb534e57cc.tar.gz nixlib-4d0a421f18cbb647af349d3a3bd7eceb534e57cc.tar.bz2 nixlib-4d0a421f18cbb647af349d3a3bd7eceb534e57cc.tar.lz nixlib-4d0a421f18cbb647af349d3a3bd7eceb534e57cc.tar.xz nixlib-4d0a421f18cbb647af349d3a3bd7eceb534e57cc.tar.zst nixlib-4d0a421f18cbb647af349d3a3bd7eceb534e57cc.zip | |
Merge pull request #15646 from vcunat/p/man-db
man-db: make it the default man provider
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fb1b3571e37a..a6b312619c9a 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 5f9e0701ca79..55c9c01d8247 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2380,9 +2380,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 { }; |