From e5f00e0e52fd0d14cf03b0ae4a32a6dad1200347 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 21 Jul 2024 20:01:26 +0200 Subject: [PATCH 1/6] nmap: 7.94 -> 7.95 --- pkgs/tools/security/nmap/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 9280abbcfb5d..503a537fbd52 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchurl, libpcap, pkg-config, openssl, lua5_4 -, pcre, libssh2 +, pcre2, libssh2 , 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 '' @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ pcre libssh2 libpcap openssl ]; + buildInputs = [ pcre2 libssh2 libpcap openssl ]; enableParallelBuilding = true; From e68494d4713897d46ad80caa92dd4e1549d7a075 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 21 Jul 2024 20:15:11 +0200 Subject: [PATCH 2/6] nmap: reformat --- pkgs/tools/security/nmap/default.nix | 34 ++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 503a537fbd52..0c1e33219f22 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -1,6 +1,14 @@ -{ lib, stdenv, fetchurl, libpcap, pkg-config, openssl, lua5_4 -, pcre2, libssh2 -, withLua ? true +{ + lib, + stdenv, + fetchurl, + libpcap, + pkg-config, + openssl, + lua5_4, + pcre2, + libssh2, + withLua ? true, }: stdenv.mkDerivation rec { @@ -37,17 +45,25 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ pcre2 libssh2 libpcap openssl ]; + buildInputs = [ + pcre2 + libssh2 + libpcap + openssl + ]; 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 + ]; }; } From 0ece69c750f2b38f3bdb56e1eeb7c10f4588d2a9 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 21 Jul 2024 20:26:57 +0200 Subject: [PATCH 3/6] nmap: move to by-name --- .../security/nmap/default.nix => by-name/nm/nmap/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/security/nmap/default.nix => by-name/nm/nmap/package.nix} (100%) diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/by-name/nm/nmap/package.nix similarity index 100% rename from pkgs/tools/security/nmap/default.nix rename to pkgs/by-name/nm/nmap/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cad427f99100..54f6c87c243f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10925,8 +10925,6 @@ 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 { }; From 271ef65cb88de00e25afabec5e94147de50ebdaa Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 21 Jul 2024 20:35:45 +0200 Subject: [PATCH 4/6] nmap: don't compile with included libinear & zlib --- pkgs/by-name/nm/nmap/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/nm/nmap/package.nix b/pkgs/by-name/nm/nmap/package.nix index 0c1e33219f22..6b6a83c7eae9 100644 --- a/pkgs/by-name/nm/nmap/package.nix +++ b/pkgs/by-name/nm/nmap/package.nix @@ -7,7 +7,9 @@ openssl, lua5_4, pcre2, + liblinear, libssh2, + zlib, withLua ? true, }: @@ -29,7 +31,6 @@ stdenv.mkDerivation rec { configureFlags = [ (if withLua then "--with-liblua=${lua5_4}" else "--without-liblua") - "--with-liblinear=included" "--without-ndiff" "--without-zenmap" ]; @@ -47,9 +48,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ pcre2 + liblinear libssh2 libpcap openssl + zlib ]; enableParallelBuilding = true; From a3140b5bc8d08da6f759a88aef1826b9f2aa5465 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 21 Jul 2024 20:28:07 +0200 Subject: [PATCH 5/6] nmapsi4: move to by-name --- .../nmap/qt.nix => by-name/nm/nmapsi4/package.nix} | 9 +++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 8 deletions(-) rename pkgs/{tools/security/nmap/qt.nix => by-name/nm/nmapsi4/package.nix} (89%) diff --git a/pkgs/tools/security/nmap/qt.nix b/pkgs/by-name/nm/nmapsi4/package.nix similarity index 89% rename from pkgs/tools/security/nmap/qt.nix rename to pkgs/by-name/nm/nmapsi4/package.nix index 956649088ff3..9faf7eb46e02 100644 --- a/pkgs/tools/security/nmap/qt.nix +++ b/pkgs/by-name/nm/nmapsi4/package.nix @@ -2,12 +2,9 @@ , fetchFromGitHub , cmake , pkg-config -, wrapQtAppsHook , dnsutils , nmap -, qtbase -, qtscript -, qtwebengine +, libsForQt5 }: stdenv.mkDerivation rec { @@ -21,9 +18,9 @@ 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 \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54f6c87c243f..b1bd1f2b7422 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10927,8 +10927,6 @@ with pkgs; 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 { }; From 598c87675a59bad9c0d79e1eae1e1dfc6964d344 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 21 Jul 2024 20:29:25 +0200 Subject: [PATCH 6/6] nmapsi4: reformat --- pkgs/by-name/nm/nmapsi4/package.nix | 34 +++++++++++++++++++---------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/nm/nmapsi4/package.nix b/pkgs/by-name/nm/nmapsi4/package.nix index 9faf7eb46e02..a9574b4baa01 100644 --- a/pkgs/by-name/nm/nmapsi4/package.nix +++ b/pkgs/by-name/nm/nmapsi4/package.nix @@ -1,10 +1,12 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, dnsutils -, nmap -, libsForQt5 +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + dnsutils, + nmap, + libsForQt5, }: stdenv.mkDerivation rec { @@ -18,9 +20,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-q3XfwJ4TGK4E58haN0Q0xRH4GDpKD8VZzyxHe/VwBqY="; }; - nativeBuildInputs = [ cmake pkg-config libsForQt5.wrapQtAppsHook ]; + nativeBuildInputs = [ + cmake + pkg-config + libsForQt5.wrapQtAppsHook + ]; - buildInputs = with libsForQt5; [ qtbase qtscript qtwebengine ]; + buildInputs = with libsForQt5; [ + qtbase + qtscript + qtwebengine + ]; postPatch = '' substituteInPlace src/platform/digmanager.cpp \ @@ -48,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; }; }