all-packages: Use callPackage where possible

pkgs/tools/security/bmrsa/11.nix

@@ -1,5 +1,5 @@
-args :  
-let 
+args @ {unzip, ... } :
+let
   lib = args.lib;
   fetchurl = args.fetchurl;
   fullDepEntry = args.fullDepEntry;

pkgs/tools/security/metasploit/3.1.nix

@@ -1,4 +1,4 @@
-args : with args; 
+args @ { makeWrapper, ... }: with args;
 rec {
   src = fetchurl {
     url = http://www.packetstormsecurity.nl/UNIX/utilities/framework-3.1.tar.gz;
@@ -21,7 +21,7 @@ rec {
 
   /* doConfigure should be specified separately */
   phaseNames = ["doInstall" (doPatchShebangs "$out/share/msf")];
-      
+
   name = "metasploit-framework-3.1";
   meta = {
     description = "Metasploit Framework - a collection of exploits";