diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2019-01-24 00:58:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-24 00:58:36 +0100 |
| commit | 62580e9529fdef02b0b2002e9c87c20dd2bae8f5 (patch) | |
| tree | 069a4ccf6cc4fedce6ba0a8dba7f5556ae00e801 | |
| parent | 7790dbe6a27d6bea22ecc62bf21841ccb427ec3b (diff) | |
| parent | d9332f2a7159a6cbdcd63c8d4c739982ce850a0c (diff) | |
| download | nixlib-62580e9529fdef02b0b2002e9c87c20dd2bae8f5.tar nixlib-62580e9529fdef02b0b2002e9c87c20dd2bae8f5.tar.gz nixlib-62580e9529fdef02b0b2002e9c87c20dd2bae8f5.tar.bz2 nixlib-62580e9529fdef02b0b2002e9c87c20dd2bae8f5.tar.lz nixlib-62580e9529fdef02b0b2002e9c87c20dd2bae8f5.tar.xz nixlib-62580e9529fdef02b0b2002e9c87c20dd2bae8f5.tar.zst nixlib-62580e9529fdef02b0b2002e9c87c20dd2bae8f5.zip | |
Merge pull request #54516 from matthewbauer/column
unixtools.utillinux: add column
| -rw-r--r-- | pkgs/os-specific/bsd/netbsd/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/unix-tools.nix | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index c53b7e50b9f3..d7f7c64fc2d6 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -548,6 +548,12 @@ let NIX_CFLAGS_COMPILE = "-DYESSTR=__YESSTR -DNOSTR=__NOSTR"; }; + column = netBSDDerivation { + path = "usr.bin/column"; + version = "8.0"; + sha256 = "0r6b0hjn5ls3j3sv6chibs44fs32yyk2cg8kh70kb4cwajs4ifyl"; + }; + }; in nbPackages diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index bc166382a608..7d4986068332 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -55,6 +55,10 @@ let linux = pkgs.utillinux; darwin = pkgs.darwin.text_cmds; }; + column = { + linux = pkgs.utillinux; + darwin = pkgs.netbsd.column; + }; eject = { linux = pkgs.utillinux; }; @@ -182,7 +186,7 @@ let compat = with bins; lib.mapAttrs makeCompat { procps = [ ps sysctl top watch ]; utillinux = [ fsck fdisk getopt hexdump mount - script umount whereis write col ]; + script umount whereis write col column ]; nettools = [ arp hostname ifconfig netstat route ]; }; in bins // compat |