From 712ba6a25c9ecda62d81d0647a21819f8d1e0bc6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 22 Mar 2008 19:52:11 +0000
Subject: [PATCH] Updated nmap

svn path=/nixpkgs/trunk/; revision=11267
---
 pkgs/tools/security/nmap/default.nix | 11 ++++++-----
 pkgs/top-level/all-packages.nix      |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix
index 9688473de9b..e3e3dafe79f 100644
--- a/pkgs/tools/security/nmap/default.nix
+++ b/pkgs/tools/security/nmap/default.nix
@@ -1,11 +1,12 @@
-{stdenv, fetchurl, libpcap, libX11, gtk, pkgconfig}:
+{stdenv, fetchurl, libpcap, libX11, gtk, pkgconfig,
+  openssl, python, pygtk}:
 stdenv.mkDerivation {
   name = "Nmap";
 
   src = fetchurl {
-    url = http://insecure.org/nmap/dist/nmap-4.21ALPHA4.tar.bz2;
-    md5 = "eae883e12f3640f7c52d66e0844d0ab1";
-  };
+    url = http://download.insecure.org/nmap/dist/nmap-4.60.tar.bz2;
+    sha256 = "1jhway86lmrnyzvwi24ama1vrz89f9nmln29vr92kb31aw2nl30w";  };
 
-  buildInputs = [libpcap libX11 gtk pkgconfig];
+  buildInputs = [libpcap libX11 gtk pkgconfig openssl python 
+    pygtk];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d7e636ba367..e3dca2a3bd9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -812,7 +812,8 @@ let pkgs = rec {
   };
 
   nmap = import ../tools/security/nmap {
-    inherit fetchurl stdenv libpcap pkgconfig;
+    inherit fetchurl stdenv libpcap pkgconfig openssl
+      python pygtk;
     inherit (xlibs) libX11;
     inherit (gtkLibs) gtk;
   };