There ver very many conflicts, basically all due to
name -> pname+version. Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job. There might be some fallback to these
conflicts, but I believe it should be minimal.
Hydra nixpkgs: ?compare=1538299
* nfdump: 1.6.16 -> 1.6.17
Build system switched to autotools in the new version.
Also enabled the build of a few additional tools.
- Remove unneeded call to patchShebangs
- Add a comment explaining the darwin libtoolize workaround
Semi-automatic update. These checks were performed:
- built on NixOS
- ran `/nix/store/jddz0kmz55knai4a07m9c7awarb4zsq5-nfdump-1.6.16/bin/nfcapd -h` got 0 exit code
- ran `/nix/store/jddz0kmz55knai4a07m9c7awarb4zsq5-nfdump-1.6.16/bin/nfcapd -V` and found version 1.6.16
- ran `/nix/store/jddz0kmz55knai4a07m9c7awarb4zsq5-nfdump-1.6.16/bin/nfcapd -h` and found version 1.6.16
- ran `/nix/store/jddz0kmz55knai4a07m9c7awarb4zsq5-nfdump-1.6.16/bin/nfdump -h` got 0 exit code
- ran `/nix/store/jddz0kmz55knai4a07m9c7awarb4zsq5-nfdump-1.6.16/bin/nfdump --help` got 0 exit code
- ran `/nix/store/jddz0kmz55knai4a07m9c7awarb4zsq5-nfdump-1.6.16/bin/nfdump -V` and found version 1.6.16
- ran `/nix/store/jddz0kmz55knai4a07m9c7awarb4zsq5-nfdump-1.6.16/bin/nfdump -v` and found version 1.6.16
- ran `/nix/store/jddz0kmz55knai4a07m9c7awarb4zsq5-nfdump-1.6.16/bin/nfdump --version` and found version 1.6.16
- ran `/nix/store/jddz0kmz55knai4a07m9c7awarb4zsq5-nfdump-1.6.16/bin/nfdump -h` and found version 1.6.16
- ran `/nix/store/jddz0kmz55knai4a07m9c7awarb4zsq5-nfdump-1.6.16/bin/nfdump --help` and found version 1.6.16
- ran `/nix/store/jddz0kmz55knai4a07m9c7awarb4zsq5-nfdump-1.6.16/bin/nfreplay -h` got 0 exit code
- ran `/nix/store/jddz0kmz55knai4a07m9c7awarb4zsq5-nfdump-1.6.16/bin/nfreplay --help` got 0 exit code
- ran `/nix/store/jddz0kmz55knai4a07m9c7awarb4zsq5-nfdump-1.6.16/bin/nfreplay -V` and found version 1.6.16
- ran `/nix/store/jddz0kmz55knai4a07m9c7awarb4zsq5-nfdump-1.6.16/bin/nfreplay -v` and found version 1.6.16
- ran `/nix/store/jddz0kmz55knai4a07m9c7awarb4zsq5-nfdump-1.6.16/bin/nfreplay --version` and found version 1.6.16
- ran `/nix/store/jddz0kmz55knai4a07m9c7awarb4zsq5-nfdump-1.6.16/bin/nfreplay -h` and found version 1.6.16
- ran `/nix/store/jddz0kmz55knai4a07m9c7awarb4zsq5-nfdump-1.6.16/bin/nfreplay --help` and found version 1.6.16
- ran `/nix/store/jddz0kmz55knai4a07m9c7awarb4zsq5-nfdump-1.6.16/bin/nfexpire -h` got 0 exit code
- ran `/nix/store/jddz0kmz55knai4a07m9c7awarb4zsq5-nfdump-1.6.16/bin/nfexpire -h` and found version 1.6.16
- ran `/nix/store/jddz0kmz55knai4a07m9c7awarb4zsq5-nfdump-1.6.16/bin/nfanon -h` got 0 exit code
- ran `/nix/store/jddz0kmz55knai4a07m9c7awarb4zsq5-nfdump-1.6.16/bin/nfanon --help` got 0 exit code
- ran `/nix/store/jddz0kmz55knai4a07m9c7awarb4zsq5-nfdump-1.6.16/bin/nfanon -V` and found version 1.6.16
- ran `/nix/store/jddz0kmz55knai4a07m9c7awarb4zsq5-nfdump-1.6.16/bin/nfanon -v` and found version 1.6.16
- ran `/nix/store/jddz0kmz55knai4a07m9c7awarb4zsq5-nfdump-1.6.16/bin/nfanon --version` and found version 1.6.16
- ran `/nix/store/jddz0kmz55knai4a07m9c7awarb4zsq5-nfdump-1.6.16/bin/nfanon -h` and found version 1.6.16
- ran `/nix/store/jddz0kmz55knai4a07m9c7awarb4zsq5-nfdump-1.6.16/bin/nfanon --help` and found version 1.6.16
- found 1.6.16 with grep in /nix/store/jddz0kmz55knai4a07m9c7awarb4zsq5-nfdump-1.6.16
- found 1.6.16 in filename of file in /nix/store/jddz0kmz55knai4a07m9c7awarb4zsq5-nfdump-1.6.16
cc "@takikawa"
