Merge branch 'master' into closure-size

pkgs/tools/security/minisign/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "minisign-${version}";
-  version = "0.4";
+  version = "0.6";
 
   src = fetchurl {
     url = "https://github.com/jedisct1/minisign/archive/${version}.tar.gz";
-    sha256 = "1k1dk6piaz8pw4b9zg55n4wcpyc301mkxb873njm8mki7r8raxnw";
+    sha256 = "029g8ian72fy07k73nf451dw1yggav6crjjc2x6kv4nfpq3pl9pj";
   };
 
   buildInputs = [ cmake libsodium ];

pkgs/tools/security/nmap/default.nix

@@ -13,11 +13,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "nmap${optionalString graphicalSupport "-graphical"}-${version}";
-  version = "6.49BETA4";
+  version = "7.00";
 
   src = fetchurl {
     url = "http://nmap.org/dist/nmap-${version}.tar.bz2";
-    sha256 = "042fg73w7596b3h6ha9y62ckc0hd352zv1shwip3dx14v5igrsna";
+    sha256 = "1bh25200jidhb2ig206ibiwv1ngyrl2ka743hnihiihmqq0j6i4z";
   };
 
   patches = ./zenmap.patch;

pkgs/tools/security/radamsa/default.nix

@@ -0,0 +1,27 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "radamsa-${version}";
+  version = "0.4";
+
+  src = fetchurl {
+    url = "http://haltp.org/download/${name}.tar.gz";
+    sha256 = "1xs9dsrq6qrf104yi9x21scpr73crfikbi8q9njimiw5c1y6alrv";
+  };
+
+  patchPhase = ''
+    substituteInPlace ./tests/bd.sh  \
+      --replace "/bin/echo" echo
+    substituteInPlace ./Makefile \
+      --replace "PREFIX=/usr" "PREFIX=$out" \
+      --replace "BINDIR=/bin" "BINDIR="
+  '';
+  
+  meta = {
+    description = "A general purpose fuzzer";
+    longDescription = "Radamsa is a general purpose data fuzzer. It reads data from given sample files, or standard input if none are given, and outputs modified data. It is usually used to generate malformed data for testing programs.";
+    homepage = http://github.com/aoh/radamsa;
+    maintainers = [ stdenv.lib.maintainers.markWot ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}