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

xxd: move to unixtools

Browse Source 
also add manpage to unixtools if provided to give compat with old xxd.
This commit is contained in:
Matthew Bauer 2018-07-04 15:24:58 -04:00
parent e776d326f6
commit 2f523dd9a4
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18590,8 +18590,6 @@ with pkgs;
flags = [ "python" "X11" ]; # only flag "X11" by now flags = [ "python" "X11" ]; # only flag "X11" by now
}); });
xxd = callPackage ../tools/misc/xxd { };
vimNox = lowPrio (vim_configurable.override { vimNox = lowPrio (vim_configurable.override {
source = "vim-nox"; source = "vim-nox";
lua = pkgs.lua5_1; # vimNox source is from 2012, requires older lua lua = pkgs.lua5_1; # vimNox source is from 2012, requires older lua
@ -21816,7 +21814,7 @@ with pkgs;
unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { }); unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { });
inherit (unixtools) hexdump ps logger eject umount inherit (unixtools) hexdump ps logger eject umount
mount wall hostname more sysctl getconf mount wall hostname more sysctl getconf
getent locale killall; getent locale killall xxd;
fts = if hostPlatform.isMusl then netbsd.fts else null; fts = if hostPlatform.isMusl then netbsd.fts else null;

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

@ -16,6 +16,7 @@ let
singleBinary = cmd: providers: let singleBinary = cmd: providers: let
provider = "${lib.getBin providers.${hostPlatform.parsed.kernel.name}}/bin/${cmd}"; provider = "${lib.getBin providers.${hostPlatform.parsed.kernel.name}}/bin/${cmd}";
manpage = "${lib.getOutput "man" providers.${hostPlatform.parsed.kernel.name}}/share/man/man1/${cmd}.1.gz";
in runCommand "${cmd}-${version}" { in runCommand "${cmd}-${version}" {
meta.platforms = map (n: { kernel.name = n; }) (pkgs.lib.attrNames providers); meta.platforms = map (n: { kernel.name = n; }) (pkgs.lib.attrNames providers);
} '' } ''
@ -25,6 +26,10 @@ let
fi fi
install -D "${provider}" "$out/bin/${cmd}" install -D "${provider}" "$out/bin/${cmd}"
if [ -f "${manpage}" ]; then
install -D "${manpage}" $out/share/man/man1/${cmd}.1.gz
fi
''; '';
# more is unavailable in darwin # more is unavailable in darwin
@ -147,6 +152,10 @@ let
linux = pkgs.utillinux; linux = pkgs.utillinux;
darwin = pkgs.darwin.basic_cmds; darwin = pkgs.darwin.basic_cmds;
}; };
xxd = {
linux = pkgs.vim;
darwin = pkgs.vim;
};
}; };
makeCompat = name': value: buildEnv { makeCompat = name': value: buildEnv {