diff options
author | Austin Seipp <aseipp@pobox.com> | 2014-12-28 23:18:49 -0600 |
---|---|---|
committer | Austin Seipp <aseipp@pobox.com> | 2014-12-28 23:41:54 -0600 |
commit | baa2e7326fe5798cba32b134a24062203461d717 (patch) | |
tree | e220d583284236a678d11c5a6108307448ec8da6 /pkgs/tools/security/nmap | |
parent | 1d44322d53b9ea1937ec11ff41983a387947539e (diff) |
nixpkgs: nmap 6.40 -> 6.47
Signed-off-by: Austin Seipp <aseipp@pobox.com>
Diffstat (limited to 'pkgs/tools/security/nmap')
-rw-r--r-- | pkgs/tools/security/nmap/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 61e4989f6cbd1..e7b3848056f24 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -13,16 +13,20 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; - version = "6.40"; + version = "6.47"; src = fetchurl { - url = "http://nmap.org/dist/${name}.tar.bz2"; - sha256 = "491f77d8b3fb3bb38ba4e3850011fe6fb43bbe197f9382b88cb59fa4e8f7a401"; + url = "http://nmap.org/dist/nmap-${version}.tar.bz2"; + sha256 = "14d53aji4was68c01pf105n5ylha257wmdbx40ddiqiw42g1x8cg"; }; - patches = optional graphicalSupport ./zenmap.patch; + patches = ./zenmap.patch; - postInstall = optionalString graphicalSupport '' + configureFlags = optionalString (!graphicalSupport) "--without-zenmap"; + + postInstall = '' + wrapProgram $out/bin/ndiff --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" + '' + optionalString graphicalSupport '' wrapProgram $out/bin/zenmap --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" --prefix PYTHONPATH : $(toPythonPath ${pygtk})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pygobject})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pycairo})/gtk-2.0 ''; |