diff --git a/pkgs/tools/security/nmap-unfree/default.nix b/pkgs/tools/security/nmap-unfree/default.nix deleted file mode 100644 index 1e6ed42bae45..000000000000 --- a/pkgs/tools/security/nmap-unfree/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib -, stdenv -, fetchurl -, libpcap -, pkg-config -, openssl -, lua5_3 -, pcre -, liblinear -, libssh2 -, zlib -, withLua ? true -}: - -stdenv.mkDerivation rec { - pname = "nmap-unfree"; - version = "7.91"; - - src = fetchurl { - url = "https://nmap.org/dist/nmap-${version}.tar.bz2"; - sha256 = "001kb5xadqswyw966k2lqi6jr6zz605jpp9w4kmm272if184pk0q"; - }; - - prePatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace libz/configure \ - --replace /usr/bin/libtool ar \ - --replace 'AR="libtool"' 'AR="ar"' \ - --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"' - ''; - - configureFlags = [ - (if withLua then "--with-liblua=${lua5_3}" else "--without-liblua") - ]; - - makeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "AR=${stdenv.cc.bintools.targetPrefix}ar" - "RANLIB=${stdenv.cc.bintools.targetPrefix}ranlib" - "CC=${stdenv.cc.targetPrefix}gcc" - ]; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ - pcre - liblinear - libssh2 - libpcap - openssl - zlib - ]; - - enableParallelBuilding = true; - - # Tests require network access - doCheck = false; - - meta = with lib; { - description = "Open source utility for network discovery and security auditing"; - homepage = "http://www.nmap.org"; - # Nmap Public Source License Version 0.93 - # https://github.com/nmap/nmap/blob/master/LICENSE - license = licenses.unfree; - maintainers = with maintainers; [ fab SuperSandro2000 ]; - }; -} diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 531eb6eae4a5..a6d2ab143621 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -12,11 +12,11 @@ with lib; stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; - version = "7.80"; + version = "7.91"; src = fetchurl { url = "https://nmap.org/dist/nmap-${version}.tar.bz2"; - sha256 = "1aizfys6l9f9grm82bk878w56mg0zpkfns3spzj157h98875mypw"; + sha256 = "001kb5xadqswyw966k2lqi6jr6zz605jpp9w4kmm272if184pk0q"; }; patches = [ ./zenmap.patch ] diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a148788c35b5..88d289a8379e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -526,6 +526,7 @@ mapAliases ({ nix-review = nixpkgs-review; # added 2019-12-22 nixFlakes = nixUnstable; # added 2021-05-21 nmap_graphical = nmap-graphical; # added 2017-01-19 + nmap-unfree = nmap; # added 2021-04-06 nologin = shadow; # added 2018-04-25 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # added 2021-05-27 nxproxy = nx-libs; # added 2019-02-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e78e27a41eb4..a4b8dbf0af09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7495,8 +7495,6 @@ in graphicalSupport = true; }; - nmap-unfree = callPackage ../tools/security/nmap-unfree { }; - nmapsi4 = libsForQt514.callPackage ../tools/security/nmap/qt.nix { }; nnn = callPackage ../applications/misc/nnn { };