mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-06 04:27:27 +03:00
Merge pull request #328957 from fpletz/pkgs/nmap-7.95
This commit is contained in:
commit
2c7aeac0b4
@ -1,15 +1,25 @@
|
||||
{ lib, stdenv, fetchurl, libpcap, pkg-config, openssl, lua5_4
|
||||
, pcre, libssh2
|
||||
, withLua ? true
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
libpcap,
|
||||
pkg-config,
|
||||
openssl,
|
||||
lua5_4,
|
||||
pcre2,
|
||||
liblinear,
|
||||
libssh2,
|
||||
zlib,
|
||||
withLua ? true,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nmap";
|
||||
version = "7.94";
|
||||
version = "7.95";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://nmap.org/dist/nmap-${version}.tar.bz2";
|
||||
sha256 = "sha256-1xvhie7EPX4Jm6yFcVCdMWxFd8p5SRgyrD4SF7yPksw=";
|
||||
sha256 = "sha256-4Uq1MOR7Wv2I8ciiusf4nNj+a0eOItJVxbm923ocV3g=";
|
||||
};
|
||||
|
||||
prePatch = lib.optionalString stdenv.isDarwin ''
|
||||
@ -21,7 +31,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
configureFlags = [
|
||||
(if withLua then "--with-liblua=${lua5_4}" else "--without-liblua")
|
||||
"--with-liblinear=included"
|
||||
"--without-ndiff"
|
||||
"--without-zenmap"
|
||||
];
|
||||
@ -37,17 +46,27 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ pcre libssh2 libpcap openssl ];
|
||||
buildInputs = [
|
||||
pcre2
|
||||
liblinear
|
||||
libssh2
|
||||
libpcap
|
||||
openssl
|
||||
zlib
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = false; # fails 3 tests, probably needs the net
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Free and open source utility for network discovery and security auditing";
|
||||
homepage = "http://www.nmap.org";
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ thoughtpolice fpletz ];
|
||||
homepage = "http://www.nmap.org";
|
||||
license = lib.licenses.gpl2Only;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [
|
||||
thoughtpolice
|
||||
fpletz
|
||||
];
|
||||
};
|
||||
}
|
@ -1,13 +1,12 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, dnsutils
|
||||
, nmap
|
||||
, qtbase
|
||||
, qtscript
|
||||
, qtwebengine
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
dnsutils,
|
||||
nmap,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -21,9 +20,17 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-q3XfwJ4TGK4E58haN0Q0xRH4GDpKD8VZzyxHe/VwBqY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [ qtbase qtscript qtwebengine ];
|
||||
buildInputs = with libsForQt5; [
|
||||
qtbase
|
||||
qtscript
|
||||
qtwebengine
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/platform/digmanager.cpp \
|
||||
@ -51,11 +58,11 @@ stdenv.mkDerivation rec {
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Qt frontend for nmap";
|
||||
mainProgram = "nmapsi4";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ peterhoeg ];
|
||||
inherit (src.meta) homepage;
|
||||
};
|
||||
}
|
@ -10909,12 +10909,8 @@ with pkgs;
|
||||
|
||||
npth = callPackage ../development/libraries/npth { };
|
||||
|
||||
nmap = callPackage ../tools/security/nmap { };
|
||||
|
||||
nmap-formatter = callPackage ../tools/security/nmap-formatter { };
|
||||
|
||||
nmapsi4 = libsForQt5.callPackage ../tools/security/nmap/qt.nix { };
|
||||
|
||||
noise-repellent = callPackage ../applications/audio/noise-repellent { };
|
||||
|
||||
noisetorch = callPackage ../applications/audio/noisetorch { };
|
||||
|
Loading…
Reference in New Issue
Block a user