Merge remote-tracking branch 'origin/master' into closure-size

pkgs/tools/security/bmrsa/11.nix

@@ -1,38 +1,28 @@
-args @ {unzip, ... } :
-let
-  lib = args.lib;
-  fetchurl = args.fetchurl;
-  fullDepEntry = args.fullDepEntry;
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "bmrsa-${version}";
+  version = "11";
 
-  version = "11"; 
-  buildInputs = with args; [
-    unzip
-  ];
-in
-rec {
   src = fetchurl {
     url = "mirror://sourceforge/bmrsa/bmrsa${version}.zip";
     sha256 = "0ksd9xkvm9lkvj4yl5sl0zmydp1wn3xhc55b28gj70gi4k75kcl4";
   };
 
-  inherit buildInputs;
-  configureFlags = [];
+  buildInputs = [ unzip ];
 
-  /* doConfigure should be specified separately */
-  phaseNames = ["doMakeInstall"];
-
-  doUnpack = fullDepEntry (''
+  unpackPhase = ''
     mkdir bmrsa
-    cd bmrsa 
+    cd bmrsa
     unzip ${src}
     sed -e 's/gcc/g++/' -i Makefile
     mkdir -p $out/bin
     echo -e 'install:\n\tcp bmrsa '$out'/bin' >> Makefile
-  '') ["minInit" "addInputs" "defEnsureDir"];
-      
-  name = "bmrsa-"+version;
-  meta = {
+  '';
+
+  meta = with stdenv.lib; {
     description = "RSA utility";
+    homepage = http://bmrsa.sourceforge.net/;
+    license = licenses.gpl1;
   };
 }
-

pkgs/tools/security/ccid/default.nix

@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
     homepage = http://pcsclite.alioth.debian.org/;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ viric wkennington ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }

pkgs/tools/security/eid-viewer/default.nix

@@ -43,6 +43,6 @@ in stdenv.mkDerivation rec {
       which is required to actually use your eID for authentication or signing.
     '';
     maintainers = with maintainers; [ nckx ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }

pkgs/tools/security/gpgstats/default.nix

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.vanheusden.com/gpgstats/;
     license = licenses.gpl2;
     maintainers = with maintainers; [ davidak ];
-    platforms = with platforms; unix;
+    platforms = platforms.unix;
   };
 }
 

pkgs/tools/security/john/default.nix

@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     homepage = https://github.com/magnumripper/JohnTheRipper/;
     maintainers = with maintainers; [ offline ];
-    platforms = with platforms; unix;
+    platforms = platforms.unix;
   };
 }

pkgs/tools/security/knockknock/default.nix

@@ -24,7 +24,7 @@ buildPythonPackage rec {
     homepage    = "http://www.thoughtcrime.org/software/knockknock/";
     license     = licenses.gpl3;
     maintainers = with maintainers; [ copumpkin ];
-    platforms   = with platforms; linux;
+    platforms   = platforms.linux;
   };
 }
 

pkgs/tools/security/logkeys/default.nix

@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3;
     homepage = https://github.com/kernc/logkeys;
     maintainers = with maintainers; [offline];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }

pkgs/tools/security/metasploit/3.1.nix

@@ -1,31 +0,0 @@
-args @ { makeWrapper, ... }: with args;
-rec {
-  src = fetchurl {
-    url = http://www.packetstormsecurity.nl/UNIX/utilities/framework-3.1.tar.gz;
-    sha256 = "114znq9dfcyh9gcj57p3zsc0d0amlzhwidmg8qjcgxpjh28h1afx";
-  };
-
-  buildInputs = [makeWrapper];
-  configureFlags = [];
-
-  doInstall = fullDepEntry(''
-    mkdir -p $out/share/msf
-    mkdir -p $out/bin
-
-    cp -r * $out/share/msf
-
-    for i in $out/share/msf/msf*; do
-        makeWrapper $i $out/bin/$(basename $i) --prefix RUBYLIB : $out/share/msf/lib
-    done
-  '') ["minInit" "defEnsureDir" "doUnpack" "addInputs"];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doInstall" (doPatchShebangs "$out/share/msf")];
-
-  name = "metasploit-framework-3.1";
-  meta = {
-    description = "Metasploit Framework - a collection of exploits";
-    homepage = "http://framework.metasploit.org/";
-  };
-}
-

pkgs/tools/security/metasploit/default.nix

@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, makeWrapper, ruby }:
+
+stdenv.mkDerivation rec {
+  name = "metasploit-framework-${version}";
+  version = "3.3.1";
+
+  src = fetchurl {
+    url = "http://downloads.metasploit.com/data/releases/archive/framework-${version}.tar.bz2";
+    sha256 = "07clzw1zfnqjhyydsc4mza238isai58p7aygh653qxsqb9a0j7qw";
+  };
+
+  buildInputs = [makeWrapper];
+
+  installPhase = ''
+    mkdir -p $out/share/msf
+    mkdir -p $out/bin
+
+    cp -r * $out/share/msf
+
+    for i in $out/share/msf/msf*; do
+        makeWrapper $i $out/bin/$(basename $i) --prefix RUBYLIB : $out/share/msf/lib
+    done
+  '';
+
+  postInstall = ''
+    patchShebangs $out/share/msf
+  '';
+
+  meta = {
+    description = "Metasploit Framework - a collection of exploits";
+    homepage = https://github.com/rapid7/metasploit-framework/wiki;
+  };
+}

pkgs/tools/security/mfcuk/default.nix

@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     homepage = http://code.google.com/p/mfcuk/;
     maintainers = with maintainers; [ offline ];
-    platforms = with platforms; unix;
+    platforms = platforms.unix;
   };
 }

pkgs/tools/security/mfoc/default.nix

@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     homepage = http://code.google.com/p/mfoc/;
     maintainers = with maintainers; [ offline ];
-    platforms = with platforms; unix;
+    platforms = platforms.unix;
   };
 }

pkgs/tools/security/modsecurity/default.nix

@@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
     license = licenses.asl20;
     homepage = https://www.modsecurity.org/;
     maintainers = with maintainers; [offline];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }

pkgs/tools/security/nasty/default.nix

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.vanheusden.com/nasty/;
     license = licenses.gpl2;
     maintainers = with maintainers; [ davidak ];
-    platforms = with platforms; unix;
+    platforms = platforms.unix;
   };
 }
 

pkgs/tools/security/pcsclite/default.nix

@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     homepage = http://pcsclite.alioth.debian.org/;
     license = licenses.bsd3;
     maintainers = with maintainers; [ viric wkennington ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }

pkgs/tools/security/pcsctools/default.nix

@@ -35,6 +35,6 @@ in stdenv.mkDerivation rec {
     homepage = http://ludovic.rousseau.free.fr/softwares/pcsc-tools/;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ viric ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }

pkgs/tools/security/thc-hydra/default.nix

@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
     license = licenses.agpl3;
     homepage = https://www.thc.org/thc-hydra/;
     maintainers = with maintainers; [offline];
-    platforms = with platforms; unix;
+    platforms = platforms.unix;
   };
 }