867b4b5 · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

on master help sign in

Merge pull request #170431 from armeenm/remove-nmap-graphical

867b4b5Artturi5 years ago

pkgs/tools/security/nmap/default.nix+6−18

compare with master

unifiedsplit

@@ -1,9 +1,7 @@

1{ lib, stdenv, fetchurl, fetchpatch, libpcap, pkg-config, openssl, lua5_3

2, pcre, libssh2

3−, graphicalSupport ? false

4, libX11 ? null

3, libX11 ? null

5, gtk2 ? null

4, gtk2 ? null

6−, python2 ? null

7, makeWrapper ? null

5, makeWrapper ? null

8, withLua ? true

6, withLua ? true

9}:

7}:

@@ -11,7 +9,7 @@

11with lib;

9with lib;

13stdenv.mkDerivation rec {

11stdenv.mkDerivation rec {

14− pname = "nmap${optionalString graphicalSupport "-graphical"}";

12+ pname = "nmap";

15 version = "7.92";

13 version = "7.92";

17 src = fetchurl {

15 src = fetchurl {

@@ -41,7 +39,9 @@ stdenv.mkDerivation rec {

41 configureFlags = [

39 configureFlags = [

42 (if withLua then "--with-liblua=${lua5_3}" else "--without-liblua")

40 (if withLua then "--with-liblua=${lua5_3}" else "--without-liblua")

43 "--with-liblinear=included"

41 "--with-liblinear=included"

42+ "--without-ndiff"

44− ] ++ optionals (!graphicalSupport) [ "--without-ndiff" "--without-zenmap" ];

43+ "--without-zenmap"

44+ ];

46 makeFlags = optionals (stdenv.buildPlatform != stdenv.hostPlatform) [

47 "AR=${stdenv.cc.bintools.targetPrefix}ar"

@@ -49,20 +49,8 @@ stdenv.mkDerivation rec {

49 "CC=${stdenv.cc.targetPrefix}gcc"

50 ];

52− pythonPath = with python2.pkgs; optionals graphicalSupport [

53− pygtk pysqlite pygobject2 pycairo

54− ];

55−

56− nativeBuildInputs = [ pkg-config ] ++ optionals graphicalSupport [ python2.pkgs.wrapPython ];

52+ nativeBuildInputs = [ pkg-config ];

57− buildInputs = [ pcre libssh2 libpcap openssl ] ++ optionals graphicalSupport (with python2.pkgs; [

53+ buildInputs = [ pcre libssh2 libpcap openssl ];

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− '';

67 enableParallelBuilding = true;

55 enableParallelBuilding = true;

pkgs/top-level/aliases.nix+2−1

@@ -871,7 +871,8 @@ mapAliases ({

871 nix_2_6 = nixVersions.nix_2_6;

872 nixopsUnstable = nixops_unstable; # Added 2022-03-03

873 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

875 nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22

876 nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22

876 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27

877 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27

877 noto-fonts-cjk = noto-fonts-cjk-sans; # Added 2021-12-16

878 noto-fonts-cjk = noto-fonts-cjk-sans; # Added 2021-12-16

pkgs/top-level/all-packages.nix−4

@@ -8733,10 +8733,6 @@ with pkgs;

8733

8734 nmap = callPackage ../tools/security/nmap { };

8735

8736− nmap-graphical = nmap.override {

8737− graphicalSupport = true;

8738− };

8739−

8740 nmap-formatter = callPackage ../tools/security/nmap-formatter { };

8736 nmap-formatter = callPackage ../tools/security/nmap-formatter { };

8741

8737

8742 nmapsi4 = libsForQt5.callPackage ../tools/security/nmap/qt.nix { };

8738 nmapsi4 = libsForQt5.callPackage ../tools/security/nmap/qt.nix { };