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

Merge pull request #54516 from matthewbauer/column

Browse Source 
unixtools.utillinux: add column
This commit is contained in:
Silvan Mosberger 2019-01-24 00:58:36 +01:00 committed by GitHub
commit 62580e9529
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/bsd/netbsd/default.nix
View File

@ -548,6 +548,12 @@ let
NIX_CFLAGS_COMPILE = "-DYESSTR=__YESSTR -DNOSTR=__NOSTR"; NIX_CFLAGS_COMPILE = "-DYESSTR=__YESSTR -DNOSTR=__NOSTR";
}; };
column = netBSDDerivation {
path = "usr.bin/column";
version = "8.0";
sha256 = "0r6b0hjn5ls3j3sv6chibs44fs32yyk2cg8kh70kb4cwajs4ifyl";
};
}; };
in nbPackages in nbPackages

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

@ -55,6 +55,10 @@ let
linux = pkgs.utillinux; linux = pkgs.utillinux;
darwin = pkgs.darwin.text_cmds; darwin = pkgs.darwin.text_cmds;
}; };
column = {
linux = pkgs.utillinux;
darwin = pkgs.netbsd.column;
};
eject = { eject = {
linux = pkgs.utillinux; linux = pkgs.utillinux;
}; };
@ -182,7 +186,7 @@ let
compat = with bins; lib.mapAttrs makeCompat { compat = with bins; lib.mapAttrs makeCompat {
procps = [ ps sysctl top watch ]; procps = [ ps sysctl top watch ];
utillinux = [ fsck fdisk getopt hexdump mount utillinux = [ fsck fdisk getopt hexdump mount
script umount whereis write col ]; script umount whereis write col column ];
nettools = [ arp hostname ifconfig netstat route ]; nettools = [ arp hostname ifconfig netstat route ];
}; };
in bins // compat in bins // compat