unixtools: cleanup

1 files changed, 42 insertions, 0 deletions

diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix
index 706cd061b591..0c6b9e261dd8 100644
--- a/pkgs/top-level/unix-tools.nix
+++ b/pkgs/top-level/unix-tools.nix
@@ -1,5 +1,15 @@
 { pkgs, buildEnv, runCommand, hostPlatform }:
 
+# These are some unix tools that are commonly included in the /usr/bin
+# and /usr/sbin directory under more normal distributions. Along with
+# coreutils, these are commonly assumed to be available by build
+# systems, but we can't assume they are available. In Nix, we list
+# each program by name directly through this unixtools attribute.
+
+# You should always try to use single binaries when available. For
+# instance, if your program needs to use "ps", just list it as a build
+# input, not "procps" which requires Linux.
+
 let
 
   singleBinary = cmd: providers:
@@ -17,10 +27,22 @@ let
     else throw "${hostPlatform.parsed.kernel.name} does not have ${cmd}";
 
 in rec {
+
+  # more is unavailable in darwin
+  # just use less
+  more_compat = runCommand "more" {} ''
+    mkdir -p $out/bin
+    ln -s ${pkgs.less}/bin/less $out/bin/more
+  '';
+
+  # singular binaries
   arp = singleBinary "arp" {
     linux = pkgs.nettools;
     darwin = pkgs.darwin.network_cmds;
   };
+  eject = singleBinary "eject" {
+    linux = pkgs.utillinux;
+  };
   getopt = singleBinary "getopt" {
     linux = pkgs.utillinux;
     darwin = pkgs.darwin.shell_cmds;
@@ -37,6 +59,19 @@ in rec {
     linux = pkgs.nettools;
     darwin = pkgs.darwin.network_cmds;
   };
+  logger = singleBinary "logger" {
+    linux = pkgs.utillinux;
+  };
+  modprobe = singleBinary "modprobe" {
+    linux = pkgs.utillinux;
+  };
+  more = singleBinary "more" {
+    linux = pkgs.utillinux;
+    darwin = pkgs.more_compat;
+  };
+  mount = singleBinary "mount" {
+    linux = pkgs.utillinux;
+  };
   netstat = singleBinary "netstat" {
     linux = pkgs.nettools;
     darwin = pkgs.darwin.network_cmds;
@@ -61,16 +96,23 @@ in rec {
     linux = pkgs.procps;
     darwin = pkgs.darwin.system_cmds;
   };
+  umount = singleBinary "umount" {
+    linux = pkgs.utillinux;
+  };
   whereis = singleBinary "whereis" {
     linux = pkgs.utillinux;
     darwin = pkgs.darwin.shell_cmds;
   };
+  wall = singleBinary "wall" {
+    linux = pkgs.utillinux;
+  };
   write = singleBinary "write" {
     linux = pkgs.utillinux;
     darwin = pkgs.darwin.basic_cmds;
   };
 
   # Compatibility derivations
+  # Provided for old usage of these commands.
 
   procps = buildEnv {
     name = "procps-compat";