diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-08 16:09:25 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-09 11:59:55 -0400 |
| commit | 8ab5cc32025744d15747b96be373a066504784aa (patch) | |
| tree | 9c14571996c3d33bbe8a391951f93d6cc64fed2e | |
| parent | f4c4a4cc1bcdf163be1c54ee477624f51574136c (diff) | |
| download | nixpkgs-8ab5cc32025744d15747b96be373a066504784aa.tar nixpkgs-8ab5cc32025744d15747b96be373a066504784aa.tar.gz nixpkgs-8ab5cc32025744d15747b96be373a066504784aa.tar.bz2 nixpkgs-8ab5cc32025744d15747b96be373a066504784aa.tar.lz nixpkgs-8ab5cc32025744d15747b96be373a066504784aa.tar.xz nixpkgs-8ab5cc32025744d15747b96be373a066504784aa.tar.zst nixpkgs-8ab5cc32025744d15747b96be373a066504784aa.zip | |
unixtools: add watch command
| -rw-r--r-- | pkgs/top-level/aliases.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/unix-tools.nix | 9 |
3 files changed, 12 insertions, 5 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b653dfc7db6..1a5bf546a20 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b95eee52006..bee73847525 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index cc6a8e0592a..f92e90fed77 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -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 ]; |