diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-04-12 18:36:21 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-04-12 18:36:21 -0500 |
commit | 8287ba10fc7df5ae1cfcdd9057eb5e31f15a0824 (patch) | |
tree | 1691b3799ff5df3855535e597b87ff5f8e421e31 /pkgs/top-level/unix-tools.nix | |
parent | 5211410e69ccf686caf0210ef68999aab9aed59e (diff) | |
download | nixlib-8287ba10fc7df5ae1cfcdd9057eb5e31f15a0824.tar nixlib-8287ba10fc7df5ae1cfcdd9057eb5e31f15a0824.tar.gz nixlib-8287ba10fc7df5ae1cfcdd9057eb5e31f15a0824.tar.bz2 nixlib-8287ba10fc7df5ae1cfcdd9057eb5e31f15a0824.tar.lz nixlib-8287ba10fc7df5ae1cfcdd9057eb5e31f15a0824.tar.xz nixlib-8287ba10fc7df5ae1cfcdd9057eb5e31f15a0824.tar.zst nixlib-8287ba10fc7df5ae1cfcdd9057eb5e31f15a0824.zip |
unix-tools: cleanup things
- Adds ifconfig to nettools - Adds top to procps - Adds fsck, fdisk, mount, umount, quota to utillinux
Diffstat (limited to 'pkgs/top-level/unix-tools.nix')
-rw-r--r-- | pkgs/top-level/unix-tools.nix | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 3041ef4f16bc..5bf9278ea426 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -48,6 +48,14 @@ in rec { linux = pkgs.utillinux; darwin = pkgs.getopt; }; + fdisk = singleBinary "fdisk" { + linux = pkgs.utillinux; + darwin = pkgs.darwin.diskdev_cmds; + }; + fsck = singleBinary "fsck" { + linux = pkgs.utillinux; + darwin = pkgs.darwin.diskdev_cmds; + }; hexdump = singleBinary "hexdump" { linux = pkgs.utillinux; darwin = pkgs.darwin.shell_cmds; @@ -83,6 +91,10 @@ in rec { linux = pkgs.procps; darwin = pkgs.darwin.ps; }; + quota = singleBinary "quota" { + linux = pkgs.utillinux; + darwin = pkgs.darwin.diskdev_cmds; + }; route = singleBinary "route" { linux = pkgs.nettools; darwin = pkgs.darwin.network_cmds; @@ -95,6 +107,10 @@ in rec { linux = pkgs.procps; darwin = pkgs.darwin.system_cmds; }; + top = singleBinary "top" { + linux = pkgs.procps; + darwin = pkgs.darwin.top; + }; umount = singleBinary "umount" { linux = pkgs.utillinux; darwin = pkgs.darwin.diskdev_cmds; @@ -116,16 +132,17 @@ in rec { procps = buildEnv { name = "procps-compat"; - paths = [ sysctl ps ]; + paths = [ ps sysctl top ]; }; utillinux = buildEnv { name = "utillinux-compat"; - paths = [ getopt hexdump script whereis write ]; + paths = [ fsck fdisk getopt hexdump mount + quota script umount whereis write ]; }; nettools = buildEnv { name = "nettools-compat"; - paths = [ arp hostname netstat route ]; + paths = [ arp hostname ifconfig netstat route ]; }; } |