diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/security/nmap/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/tools/security/nmap/default.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/tools/security/nmap/default.nix b/nixpkgs/pkgs/tools/security/nmap/default.nix index 5e71c2e16551..fbabe92b199b 100644 --- a/nixpkgs/pkgs/tools/security/nmap/default.nix +++ b/nixpkgs/pkgs/tools/security/nmap/default.nix @@ -6,19 +6,17 @@ , withLua ? true }: -with lib; - stdenv.mkDerivation rec { pname = "nmap"; - version = "7.92"; + version = "7.93"; src = fetchurl { url = "https://nmap.org/dist/nmap-${version}.tar.bz2"; - sha256 = "sha256-pUefL4prCyUWdn0vcYnDhsHchY2ZcWfX7Fz8eYx1caE="; + sha256 = "sha256-Vbz+R5PiWsyWukJ02MQijbVQuOjv1yAEs47FWi3RZlE="; }; patches = [ ./zenmap.patch ] - ++ optionals stdenv.cc.isClang [( + ++ lib.optionals stdenv.cc.isClang [( # Fixes a compile error due an ambiguous reference to bind(2) in # nping/EchoServer.cc, which is otherwise resolved to std::bind. # https://github.com/nmap/nmap/pull/1363 @@ -29,7 +27,7 @@ stdenv.mkDerivation rec { } )]; - prePatch = optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace libz/configure \ --replace /usr/bin/libtool ar \ --replace 'AR="libtool"' 'AR="ar"' \ @@ -43,7 +41,7 @@ stdenv.mkDerivation rec { "--without-zenmap" ]; - makeFlags = optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + makeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.bintools.targetPrefix}ar" "RANLIB=${stdenv.cc.bintools.targetPrefix}ranlib" "CC=${stdenv.cc.targetPrefix}gcc" @@ -56,7 +54,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails 3 tests, probably needs the net - meta = { + meta = with lib; { description = "A free and open source utility for network discovery and security auditing"; homepage = "http://www.nmap.org"; license = licenses.gpl2; |