about summary refs log tree commit diff
path: root/pkgs/tools/security/nmap
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2019-08-25 14:57:11 +0200
committerVladimír Čunát <v@cunat.cz>2019-08-25 14:57:11 +0200
commit985d1ac425735963d396e1c09dd49ad111813649 (patch)
tree38a90f65d3bf5906ef020ef2c9482565325e850e /pkgs/tools/security/nmap
parentbc238b8df55bad9d8a436e120615cc5cfbbb78dc (diff)
parentf188bad6eaf26ebee19d02df03b1c6ae56c4d7f6 (diff)
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
Diffstat (limited to 'pkgs/tools/security/nmap')
-rw-r--r--pkgs/tools/security/nmap/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix
index bf9c7a4fc4613..1b66dab35c8fa 100644
--- a/pkgs/tools/security/nmap/default.nix
+++ b/pkgs/tools/security/nmap/default.nix
@@ -31,11 +31,11 @@ in stdenv.mkDerivation rec {
     ++ optionals stdenv.cc.isClang [(
       # Fixes a compile error due an ambiguous reference to bind(2) in
       # nping/EchoServer.cc, which is otherwise resolved to std::bind.
-      # Also fixes a missing include.
       # https://github.com/nmap/nmap/pull/1363
       fetchpatch {
         url = "https://github.com/nmap/nmap/commit/5bbe66f1bd8cbd3718f5805139e2e8139e6849bb.diff";
-        sha256 = "088r8ylpc9hachsxs4r17cqfa1ncyspbjvkc573lill7rk1r9m0s";
+        includes = [ "nping/EchoServer.cc" ];
+        sha256 = "0xcph9mycy57yryjg253frxyz87c4135rrbndlqw1400c8jxq70c";
       }
     )];