public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unix-tools: cleanup things

Browse Source 
- Adds ifconfig to nettools
- Adds top to procps
- Adds fsck, fdisk, mount, umount, quota to utillinux
This commit is contained in:
Matthew Bauer 2018-04-12 18:36:21 -05:00
parent 5211410e69
commit 8287ba10fc
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/top-level/unix-tools.nix
View File

@ -48,6 +48,14 @@ in rec {
linux = pkgs.utillinux; linux = pkgs.utillinux;
darwin = pkgs.getopt; 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" { hexdump = singleBinary "hexdump" {
linux = pkgs.utillinux; linux = pkgs.utillinux;
darwin = pkgs.darwin.shell_cmds; darwin = pkgs.darwin.shell_cmds;
@ -83,6 +91,10 @@ in rec {
linux = pkgs.procps; linux = pkgs.procps;
darwin = pkgs.darwin.ps; darwin = pkgs.darwin.ps;
}; };
quota = singleBinary "quota" {
linux = pkgs.utillinux;
darwin = pkgs.darwin.diskdev_cmds;
};
route = singleBinary "route" { route = singleBinary "route" {
linux = pkgs.nettools; linux = pkgs.nettools;
darwin = pkgs.darwin.network_cmds; darwin = pkgs.darwin.network_cmds;
@ -95,6 +107,10 @@ in rec {
linux = pkgs.procps; linux = pkgs.procps;
darwin = pkgs.darwin.system_cmds; darwin = pkgs.darwin.system_cmds;
}; };
top = singleBinary "top" {
linux = pkgs.procps;
darwin = pkgs.darwin.top;
};
umount = singleBinary "umount" { umount = singleBinary "umount" {
linux = pkgs.utillinux; linux = pkgs.utillinux;
darwin = pkgs.darwin.diskdev_cmds; darwin = pkgs.darwin.diskdev_cmds;
@ -116,16 +132,17 @@ in rec {
procps = buildEnv { procps = buildEnv {
name = "procps-compat"; name = "procps-compat";
paths = [ sysctl ps ]; paths = [ ps sysctl top ];
}; };
utillinux = buildEnv { utillinux = buildEnv {
name = "utillinux-compat"; name = "utillinux-compat";
paths = [ getopt hexdump script whereis write ]; paths = [ fsck fdisk getopt hexdump mount
quota script umount whereis write ];
}; };
nettools = buildEnv { nettools = buildEnv {
name = "nettools-compat"; name = "nettools-compat";
paths = [ arp hostname netstat route ]; paths = [ arp hostname ifconfig netstat route ];
}; };
} }