10 files changed, 65 insertions, 40 deletions
diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix
index a6700284af56..7a9e3fc0d1d9 100644
--- a/pkgs/tools/networking/fdm/default.nix
+++ b/pkgs/tools/networking/fdm/default.nix
@@ -1,54 +1,45 @@
-x@{builderDefsPackage
+{ stdenv, fetchurl
   , openssl, tdb, zlib, flex, bison
-  , ...}:
-builderDefsPackage
-(a :  
+  }:
 let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
-
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  buildInputs = [ openssl tdb zlib flex bison ];
   sourceInfo = rec {
     baseName="fdm";
-    version="1.7";
+    version = "1.7";
     name="${baseName}-${version}";
     url="mirror://sourceforge/${baseName}/${baseName}/${name}.tar.gz";
-    hash="0apg1jasn4m5j3vh0v9lr2l3lyzy35av1ylxr0wf8k0j9w4p8i28";
+    sha256 = "0apg1jasn4m5j3vh0v9lr2l3lyzy35av1ylxr0wf8k0j9w4p8i28";
   };
 in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation {
+  src = fetchurl {
+    inherit (sourceInfo) url sha256;
   };
 
   inherit (sourceInfo) name version;
   inherit buildInputs;
 
-  phaseNames = ["doConfigure" "fixInstall" "doMakeInstall"];
-  makeFlags = ["PREFIX=$out"];
-  fixInstall = a.fullDepEntry (''
+  preBuild = ''
+    export makeFlags="$makeFlags PREFIX=$out"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Dbool=int"
+
     sed -i */Makefile -i Makefile -e 's@ -g bin @ @'
     sed -i */Makefile -i Makefile -e 's@ -o root @ @'
     sed -i GNUmakefile -e 's@ -g $(BIN_OWNER) @ @'
     sed -i GNUmakefile -e 's@ -o $(BIN_GROUP) @ @'
     sed -i */Makefile -i Makefile -i GNUmakefile -e 's@-I-@@g'
-  '') ["minInit" "doUnpack"];
+  '';
       
   meta = {
     description = "Mail fetching and delivery tool - should do the job of getmail and procmail";
-    maintainers = with a.lib.maintainers;
+    maintainers = with stdenv.lib.maintainers;
     [
       raskin
     ];
-    platforms = with a.lib.platforms;
+    platforms = with stdenv.lib.platforms;
       linux;
+    homepage = "http://fdm.sourceforge.net/";
+    inherit (sourceInfo) version;
+    updateWalker = true;
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://fdm.sourceforge.net/";
-    };
-  };
-}) x
-
+}
diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix
index f6be163bb839..6b07d5bd2f12 100644
--- a/pkgs/tools/networking/iodine/default.nix
+++ b/pkgs/tools/networking/iodine/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://code.kryo.se/iodine/;
     description = "Tool to tunnel IPv4 data through a DNS server";
-    license = "ISC";
+    license = stdenv.lib.licenses.isc;
   };
 }
diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/tools/networking/netboot/default.nix
index dbf393094c8e..0f75bd44d69b 100644
--- a/pkgs/tools/networking/netboot/default.nix
+++ b/pkgs/tools/networking/netboot/default.nix
@@ -6,13 +6,13 @@ stdenv.mkDerivation rec {
     url = "mirror://sourceforge/netboot/${name}.tar.gz";
     sha256 = "09w09bvwgb0xzn8hjz5rhi3aibysdadbg693ahn8rylnqfq4hwg0";
   };
-  
+
   buildInputs = [ yacc lzo db4 ];
 
   meta = with stdenv.lib; {
     description = "Mini PXE server";
     maintainers = [ maintainers.raskin ];
     platforms = ["x86_64-linux"];
-    license = "free-noncopyleft";
+    license = stdenv.lib.licenses.free;
   };
 }
\ No newline at end of file
diff --git a/pkgs/tools/networking/netkit/tftp/default.nix b/pkgs/tools/networking/netkit/tftp/default.nix
index 7288bb7e39b1..858683e3374c 100644
--- a/pkgs/tools/networking/netkit/tftp/default.nix
+++ b/pkgs/tools/networking/netkit/tftp/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Netkit TFTP client and server";
     homepage = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/";
-    license = "BSD-Original";
+    license = stdenv.lib.licenses.bsdOriginal;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
   };
diff --git a/pkgs/tools/networking/nylon/default.nix b/pkgs/tools/networking/nylon/default.nix
index 9050423cfafb..9a9d41ed6a48 100644
--- a/pkgs/tools/networking/nylon/default.nix
+++ b/pkgs/tools/networking/nylon/default.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://monkey.org/~marius/nylon;
     description = "Proxy server, supporting SOCKS 4 and 5, as well as a mirror mode";
-    license = "free";
+    license = stdenv.lib.licenses.free;
   };
 }
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index a894de647588..453b6d8623f3 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = "http://www.openssh.org/";
     description = "An implementation of the SSH protocol";
-    license = "bsd"; # multi BSD GPL-2
+    license = stdenv.lib.licenses.bsd2;
     platforms = platforms.unix;
     maintainers = with maintainers; [ eelco ];
   };
diff --git a/pkgs/tools/networking/s3sync/default.nix b/pkgs/tools/networking/s3sync/default.nix
index 8390c70a4d3b..1ab3e062ca00 100644
--- a/pkgs/tools/networking/s3sync/default.nix
+++ b/pkgs/tools/networking/s3sync/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
   name = "s3sync-1.2.6";
-  
+
   src = fetchurl {
     url = http://s3.amazonaws.com/ServEdge_pub/s3sync/s3sync.tar.gz; # !!!
     sha256 = "19467mgym0da0hifhkcbivccdima7gkaw3k8q760ilfbwgwxcn7f";
@@ -24,6 +24,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://s3sync.net/;
     description = "Command-line tools to manipulate Amazon S3 buckets";
-    license = "free-non-copyleft"; # some custom as-is in file headers
+    license = stdenv.lib.licenses.free; # some custom as-is in file headers
   };
 }
diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix
index c88557262b25..48e2fc5ef787 100644
--- a/pkgs/tools/networking/siege/default.nix
+++ b/pkgs/tools/networking/siege/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "siege-3.0.6";
+  name = "siege-3.0.8";
 
   src = fetchurl {
-    url = "http://www.joedog.org/pub/siege/${name}.tar.gz";
-    sha256 = "0nwcj2s804z7yd20pa0cl010m0qgf22a02305i9jwxynwdj9kdvq";
+    url = "http://download.joedog.org/siege/${name}.tar.gz";
+    sha256 = "15xj0cl64mzf89i0jknqg37rkrcaqmgs4755l74b4nmp4bky7ddq";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/tools/networking/stun/default.nix
index 795c0cfc8ccb..ce7a4dd64340 100644
--- a/pkgs/tools/networking/stun/default.nix
+++ b/pkgs/tools/networking/stun/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Stun server and test client";
     homepage = http://sourceforge.net/projects/stun/;
-    license = "Vovida 1.0"; # See any header file.
+    license = stdenv.lib.licenses.vsl10;
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/tools/networking/swaks/default.nix
new file mode 100644
index 000000000000..0743a5c62f7e
--- /dev/null
+++ b/pkgs/tools/networking/swaks/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, perl, perlPackages, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "swaks-${version}";
+  version = "20130209.0";
+
+  src = fetchurl {
+    url = "http://www.jetmore.org/john/code/swaks/files/${name}.tar.gz";
+    sha256 = "0z0zsjminrdjpn6a8prjdwilnr27piibh78gc5ppg0nadljnf28b";
+  };
+
+  buildInputs = [ perl makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv swaks $out/bin/
+
+    wrapProgram $out/bin/swaks --set PERL5LIB \
+      "${with perlPackages; stdenv.lib.makePerlPath [
+        NetSSLeay AuthenSASL NetDNS IOSocketInet6
+      ]}"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.jetmore.org/john/code/swaks/";
+    description = ''
+      A featureful, flexible, scriptable, transaction-oriented SMTP test tool
+    '';
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ rickynils ];
+    platforms = platforms.all;
+  };
+
+}