git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #170431 from armeenm/remove-nmap-graphical
commit867b4b5eb1aea571e0828d43233e5bf96a6ad63b authorArtturi <Artturin@artturin.com> dateThu 5 May 2022, 04:18 (5 years ago) parented7482f67b8871
3 files changed+8−23
pkgs/tools/security/nmap/default.nix+6−18 pkgs/top-level/aliases.nix+2−1 pkgs/top-level/all-packages.nix−4
pkgs/tools/security/nmap/default.nix+6−18
@@ -1,9 +1,7 @@
11{ lib, stdenv, fetchurl, fetchpatch, libpcap, pkg-config, openssl, lua5_3
22, pcre, libssh2
3−, graphicalSupport ? false
43, libX11 ? null
54, gtk2 ? null
6−, python2 ? null
75, makeWrapper ? null
86, withLua ? true
97}:
@@ -11,7 +9,7 @@
119with lib;
1210
1311stdenv.mkDerivation rec {
14− pname = "nmap${optionalString graphicalSupport "-graphical"}";
12+ pname = "nmap";
1513 version = "7.92";
1614
1715 src = fetchurl {
@@ -41,7 +39,9 @@ stdenv.mkDerivation rec {
4139 configureFlags = [
4240 (if withLua then "--with-liblua=${lua5_3}" else "--without-liblua")
4341 "--with-liblinear=included"
44− ] ++ optionals (!graphicalSupport) [ "--without-ndiff" "--without-zenmap" ];
42+ "--without-ndiff"
43+ "--without-zenmap"
44+ ];
4545
4646 makeFlags = optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
4747 "AR=${stdenv.cc.bintools.targetPrefix}ar"
@@ -49,20 +49,8 @@ stdenv.mkDerivation rec {
4949 "CC=${stdenv.cc.targetPrefix}gcc"
5050 ];
5151
52− pythonPath = with python2.pkgs; optionals graphicalSupport [
53− pygtk pysqlite pygobject2 pycairo
54− ];
55−
56− nativeBuildInputs = [ pkg-config ] ++ optionals graphicalSupport [ python2.pkgs.wrapPython ];
57− buildInputs = [ pcre libssh2 libpcap openssl ] ++ optionals graphicalSupport (with python2.pkgs; [
58− python2 libX11 gtk2
59− ]);
60−
61− postInstall = optionalString graphicalSupport ''
62− buildPythonPath "$out $pythonPath"
63− patchPythonScript $out/bin/ndiff
64− patchPythonScript $out/bin/zenmap
65− '';
52+ nativeBuildInputs = [ pkg-config ];
53+ buildInputs = [ pcre libssh2 libpcap openssl ];
6654
6755 enableParallelBuilding = true;
6856
pkgs/top-level/aliases.nix+2−1
@@ -871,7 +871,8 @@ mapAliases ({
871871 nix_2_6 = nixVersions.nix_2_6;
872872 nixopsUnstable = nixops_unstable; # Added 2022-03-03
873873 nmap-unfree = nmap; # Added 2021-04-06
874− nmap_graphical = throw "'nmap_graphical' has been renamed to/replaced by 'nmap-graphical'"; # Converted to throw 2022-02-22
874+ nmap-graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Added 2022-04-26
875+ nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26
875876 nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22
876877 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27
877878 noto-fonts-cjk = noto-fonts-cjk-sans; # Added 2021-12-16
pkgs/top-level/all-packages.nix−4
@@ -8733,10 +8733,6 @@ with pkgs;
87338733
87348734 nmap = callPackage ../tools/security/nmap { };
87358735
8736− nmap-graphical = nmap.override {
8737− graphicalSupport = true;
8738− };
8739−
87408736 nmap-formatter = callPackage ../tools/security/nmap-formatter { };
87418737
87428738 nmapsi4 = libsForQt5.callPackage ../tools/security/nmap/qt.nix { };