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

unixtools: add watch command

Browse Source
This commit is contained in:
Matthew Bauer 2018-07-08 16:09:25 -04:00
parent f4c4a4cc1b
commit 8ab5cc3202
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/top-level/aliases.nix
View File

@ -219,7 +219,7 @@ mapAliases ({
pltScheme = racket; # just to be sure
polarssl = mbedtls; # added 2018-04-25
poppler_qt5 = libsForQt5.poppler; # added 2015-12-19
procps = procps-ng; # added 2018-04-25
procps-ng = procps; # added 2018-06-08
prometheus-statsd-bridge = prometheus-statsd-exporter; # added 2017-08-27
pulseaudioLight = pulseaudio; # added 2018-04-25
qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19

6
pkgs/top-level/all-packages.nix
View File

@ -14223,8 +14223,8 @@ with pkgs;
prayer = callPackage ../servers/prayer { };
procps-ng = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { }
else unixtools.procps;
procps = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { }
else unixtools.procps;
qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; });
@ -21867,7 +21867,7 @@ with pkgs;
unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { });
inherit (unixtools) hexdump ps logger eject umount
mount wall hostname more sysctl getconf
getent locale killall xxd;
getent locale killall xxd watch;
fts = if hostPlatform.isMusl then netbsd.fts else null;

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

@ -148,6 +148,13 @@ let
wall = {
linux = pkgs.utillinux;
};
watch = {
linux = pkgs.procps;
# watch is the only command from procps that builds currently on
# Darwin. Unfortunately no other implementations exist currently!
darwin = pkgs.callPackage ../os-specific/linux/procps-ng {};
};
write = {
linux = pkgs.utillinux;
darwin = pkgs.darwin.basic_cmds;
@ -166,7 +173,7 @@ let
# Compatibility derivations
# Provided for old usage of these commands.
compat = with bins; lib.mapAttrs makeCompat {
procps = [ ps sysctl top ];
procps = [ ps sysctl top watch ];
utillinux = [ fsck fdisk getopt hexdump mount
script umount whereis write col ];
nettools = [ arp hostname ifconfig netstat route ];