Commit 8287ba10 authored by Matthew Bauer's avatar Matthew Bauer
Browse files

unix-tools: cleanup things 

- Adds ifconfig to nettools
- Adds top to procps
- Adds fsck, fdisk, mount, umount, quota to utillinux
parent 5211410e

pkgs/top-level/unix-tools.nix

+20 −3
Original line number Diff line number Diff line
@@ -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 ];

  };

}