nixpkgs/pkgs/tools/security/nmap
Vladimír Čunát 985d1ac425
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
2019-08-25 14:57:11 +02:00
..
default.nix nmap: update clang specific patch 2019-08-24 13:57:35 +09:00
qt.nix
zenmap.patch