diff options
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 { }; |