* Get rid of many instances of "args: with args;", and other coding

  guidelines violations.
* Updated libsamplerate to 0.1.7.

svn path=/nixpkgs/trunk/; revision=22782

24 files changed, 184 insertions, 175 deletions

diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix
index 6f4a41d2425..b3d75106980 100644
--- a/pkgs/tools/graphics/pstoedit/default.nix
+++ b/pkgs/tools/graphics/pstoedit/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, ghostscript, gd, zlib, plotutils }:
+
 stdenv.mkDerivation {
   name = "pstoedit-3.50";
 
@@ -7,14 +8,13 @@ stdenv.mkDerivation {
     sha256 = "04ap21fxj2zn6vj9mv7zknj4svcbkb1gxwfzxkw5i0sksx969c92";
   };
 
-  buildInputs = [pkgconfig ghostscript gd zlib plotutils];
+  buildInputs = [ pkgconfig ghostscript gd zlib plotutils ];
 
   meta = { 
     description = "translates PostScript and PDF graphics into other vector formats";
     homepage = http://www.helga-glunz.homepage.t-online.de/pstoedit;
     license = "GPLv2";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
-
 }
diff --git a/pkgs/tools/misc/bfr/default.nix b/pkgs/tools/misc/bfr/default.nix
index f91a3fabc32..024798a84e3 100644
--- a/pkgs/tools/misc/bfr/default.nix
+++ b/pkgs/tools/misc/bfr/default.nix
@@ -1,17 +1,18 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, perl }:
+
+stdenv.mkDerivation {
   name = "bfr-1.6";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://www.glines.org/bin/pk/bfr-1.6.tar.bz2;
     sha256 = "0fadfssvj9klj4dq9wdrzys1k2a1z2j0p6kgnfgbjv0n1bq6h4cy";
   };
 
-  buildInputs =(with args; [perl]);
+  buildInputs = [ perl ];
 
   meta = {
-      description = "general-purpose command-line pipe buffer";
-      homepage = http://www.glines.org/wiki/bfr;
-      license = "GPL2";
+    description = "general-purpose command-line pipe buffer";
+    homepage = http://www.glines.org/wiki/bfr;
+    license = "GPL2";
   };
 }
diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index fd081940577..53027246b7f 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -1,9 +1,12 @@
-args: with args;
+{ stdenv, fetchurl, dpkg, gettext, gawk, perl, wget }:
 
-let devices = fetchurl {
+let
+
+  devices = fetchurl {
     url = mirror://gentoo/distfiles/devices.tar.gz;
     sha256 = "0j4yhajmlgvbksr2ij0dm7jy3q52j3wzhx2fs5lh05i1icygk4qd";
   };
+  
 in
 
 stdenv.mkDerivation {
@@ -14,11 +17,13 @@ stdenv.mkDerivation {
     url = mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.10lenny1_all.deb;
     sha256 = "a70af8e3369408ce9d6314fb5219de73f9523b347b75a3b07ee17ea92c445051";
   };
-  buildInputs = [dpkg gettext gawk perl];
+  
+  buildInputs = [ dpkg gettext gawk perl ];
 
   unpackPhase = ''
     dpkg-deb --extract "$src" .
   '';
+  
   buildPhase = ":";
 
   patches = [
@@ -80,12 +85,10 @@ stdenv.mkDerivation {
   */
 
   meta = { 
-    description = "create a debian system in a chroot easily.";
-    longDescription = "this way you can use debian packages we don't have in nixpkgs yet.
-      ";
+    description = "Tool to create a Debian system in a chroot";
     homepage = http://packages.debian.org/de/lenny/debootstrap; # http://code.erisian.com.au/Wiki/debootstrap
     license = "GPL-2"; # gentoo says so.. ?
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix
index b42919430dd..00265d1f31d 100644
--- a/pkgs/tools/misc/figlet/default.nix
+++ b/pkgs/tools/misc/figlet/default.nix
@@ -1,22 +1,22 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
   name = "figlet-222";
 
   # some tools can be found here ftp://ftp.figlet.org/pub/figlet/util/
-  src = args.fetchurl {
+  src = fetchurl {
     url = ftp://ftp.figlet.org/pub/figlet/program/unix/figlet222.tar.gz;
     sha256 = "1y22hhwxhnwd6yrjgl5p3p44r22xzrhv9cksj58n85laac6jdfhs";
   };
 
-  buildInputs =(with args; []);
   preConfigure = ''
     ensureDir $out/{man/man6,bin}
     makeFlags="DESTDIR=$out/bin MANDIR=$out/man/man6 DEFAULTFONTDIR=$out/share/figlet"
   '';
 
   meta = { 
-      description="program for making large letters out of ordinary text";
-      homepage = http://www.figlet.org/;
-      license = "AFL-2.1";
+    description = "Program for making large letters out of ordinary text";
+    homepage = http://www.figlet.org/;
+    license = "AFL-2.1";
   };
 }
diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/tools/misc/hddtemp/default.nix
index 9f285a6cd51..202d28684d0 100644
--- a/pkgs/tools/misc/hddtemp/default.nix
+++ b/pkgs/tools/misc/hddtemp/default.nix
@@ -1,25 +1,28 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation {
   name = "hddtemp-0.3-beta15";
 
   db = fetchurl{
-              url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp.db;
-              sha256 = "1fr6qgns6qv7cr40lic5yqwkkc7yjmmgx8j0z6d93csg3smzhhya";
-       };
+    url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp.db;
+    sha256 = "1fr6qgns6qv7cr40lic5yqwkkc7yjmmgx8j0z6d93csg3smzhhya";
+  };
+  
   src = fetchurl {
-            url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2;
-            sha256 = "0nzgg4nl8zm9023wp4dg007z6x3ir60rwbcapr9ks2al81c431b1";
+    url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2;
+    sha256 = "0nzgg4nl8zm9023wp4dg007z6x3ir60rwbcapr9ks2al81c431b1";
   };
 
-  configurePhase = "
-    ensureDir \$out/nix-support
-    cp \$db \$out/nix-support/hddtemp.db
-    ./configure --prefix=\$out --with-db-path=\$out/nix-support/hddtemp.db
-  "; 
+  configurePhase =
+    ''
+      ensureDir $out/nix-support
+      cp $db $out/nix-support/hddtemp.db
+      ./configure --prefix=$out --with-db-path=$out/nix-support/hddtemp.db
+    ''; 
 
   meta = { 
-      description = "shows the harddisk temperature";
-      homepage = https://savannah.nongnu.org/projects/hddtemp/;
-      license = "GPL2";
+    description = "Tool for displaying hard disk temperature";
+    homepage = https://savannah.nongnu.org/projects/hddtemp/;
+    license = "GPL2";
   };
 }
diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix
index 54c50c15d23..36b29083e08 100644
--- a/pkgs/tools/misc/keychain/default.nix
+++ b/pkgs/tools/misc/keychain/default.nix
@@ -1,24 +1,24 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
   name = "keychain-2.6.6";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://gentoo.chem.wisc.edu/gentoo/distfiles/keychain-2.6.6.tar.bz2;
     sha256 = "10v0hzkgrb5cazm1gk0g4ncwp8sqvfk7xfyx59cjd69kzhbbn6ic";
   };
 
   phases = "unpackPhase buildPhase";
 
-  buildPhase ="
-    mkdir -p \$out/bin
-    cp keychain \$out/bin
-  ";
-
-  buildInputs =(with args; []);
+  buildPhase =
+    ''
+      mkdir -p $out/bin
+      cp keychain $out/bin
+    '';
 
   meta = { 
-      description = "tool starting ssh and gpg management tool";
-      homepage = "http://www.gentoo.org/proj/en/keychain/";
-      license = "GPL2";
+    description = "Keychain management tool";
+    homepage = "http://www.gentoo.org/proj/en/keychain/";
+    license = "GPL2";
   };
 }
diff --git a/pkgs/tools/misc/mysql2pgsql/default.nix b/pkgs/tools/misc/mysql2pgsql/default.nix
index 77ea33dc1e9..5d93ef44b36 100644
--- a/pkgs/tools/misc/mysql2pgsql/default.nix
+++ b/pkgs/tools/misc/mysql2pgsql/default.nix
@@ -1,16 +1,17 @@
-args:
+{ stdenv, fetchurl, perl, shebangfix }:
+
 # The homepage says this script is mature..
-args.stdenv.mkDerivation {
+stdenv.mkDerivation {
   name = "mysql2pgsql-0.0.1a";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://ftp.plusline.de/ftp.postgresql.org/projects/gborg/mysql2psql/devel/mysql2psql-0.0.1a.tgz;
     sha256 = "0dpbxf3kdvpihz9cisx6wi3zzd0cnifaqvjxavrbwm4k4sz1qamp";
   };
 
   phases = "unpackPhase installPhase";
 
-  buildInputs = with args; [ perl shebangfix ];
+  buildInputs = [ perl shebangfix ];
 
   installPhase = ''
     mkdir -p $out/bin;
@@ -20,8 +21,8 @@ args.stdenv.mkDerivation {
   '';
 
   meta = { 
-      description = "converts mysql dump files to psql loadable files ";
-      homepage = http://pgfoundry.org/projects/mysql2pgsql/;
-      license = "GPL";
+    description = "converts mysql dump files to psql loadable files ";
+    homepage = http://pgfoundry.org/projects/mysql2pgsql/;
+    license = "GPL";
   };
 }
diff --git a/pkgs/tools/misc/proxytunnel/default.nix b/pkgs/tools/misc/proxytunnel/default.nix
index f587437b5da..f5be7b8a46d 100644
--- a/pkgs/tools/misc/proxytunnel/default.nix
+++ b/pkgs/tools/misc/proxytunnel/default.nix
@@ -1,19 +1,20 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, openssl }:
+
+stdenv.mkDerivation {
   name = "proxytunnel-1.9.0";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = mirror://sourceforge/proxytunnel/proxytunnel-1.9.0.tgz;
     sha256 = "1fd644kldsg14czkqjybqh3wrzwsp3dcargqf4fjkpqxv3wbpx9f";
   };
 
-  buildInputs =(with args; [openssl]);
+  buildInputs = [ openssl ];
 
-  installPhase=''make DESTDIR="$out" PREFIX="" install'';
+  installPhase = ''make DESTDIR="$out" PREFIX="" install'';
 
   meta = {
-      description = "program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy";
-      homepage = http://proxytunnel.sourceforge.net/download.php;
-      license = "GPLv2";
+    description = "program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy";
+    homepage = http://proxytunnel.sourceforge.net/download.php;
+    license = "GPLv2";
   };
 }
diff --git a/pkgs/tools/misc/shebangfix/default.nix b/pkgs/tools/misc/shebangfix/default.nix
index ca4a0004d19..082b04b95d7 100644
--- a/pkgs/tools/misc/shebangfix/default.nix
+++ b/pkgs/tools/misc/shebangfix/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, perl }:
+
 stdenv.mkDerivation {
   name = "shebangfix-0.0";
 
diff --git a/pkgs/tools/misc/slsnif/default.nix b/pkgs/tools/misc/slsnif/default.nix
index cc9f1f6f0dc..c861fc6f73a 100644
--- a/pkgs/tools/misc/slsnif/default.nix
+++ b/pkgs/tools/misc/slsnif/default.nix
@@ -1,17 +1,16 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
   name = "slsnif-0.4.4";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = mirror://sourceforge/slsnif/slsnif-0.4.4.tar.gz;
     sha256 = "0gn8c5hj8m3sywpwdgn6w5xl4rzsvg0z7d2w8dxi6p152j5b0pii";
   };
 
-  buildInputs =(with args; []);
-
   meta = { 
-      description = "serial line sniffer";
-      homepage = http://slsnif.sourceforge.net/;
-      license = "GPLv2";
+    description = "Serial line sniffer";
+    homepage = http://slsnif.sourceforge.net/;
+    license = "GPLv2";
   };
 }
diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix
index e92b5a1cd2b..4fae21250ca 100644
--- a/pkgs/tools/misc/timidity/default.nix
+++ b/pkgs/tools/misc/timidity/default.nix
@@ -1,6 +1,8 @@
-args: with args;
-let inherit (args.composableDerivation) composableDerivation edf; in
-composableDerivation {} {
+{ composableDerivation, stdenv, fetchurl, alsaLib, jackaudio, ncurses }:
+
+let inherit (composableDerivation) edf; in
+
+composableDerivation.composableDerivation {} {
 
   name = "timidity-2.13.0";
 
@@ -9,8 +11,6 @@ composableDerivation {} {
     sha256 = "1jbmk0m375fh5nj2awqzns7pdjbi7dxpjdwcix04zipfcilppbmf";
   };
 
-  buildInputs = [];
-
   mergeAttrBy.audioModes = a : b : "${a},${b}";
 
   preConfigure = ''
@@ -57,7 +57,6 @@ composableDerivation {} {
 
   meta = {
     description = "A software MIDI renderer";
-    maintainers = [args.lib.maintainers.marcweber];
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
   };
-
 }
diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/pkgs/tools/misc/ttf2pt1/default.nix
index 870c5b1e121..c112afaee0f 100644
--- a/pkgs/tools/misc/ttf2pt1/default.nix
+++ b/pkgs/tools/misc/ttf2pt1/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, perl, freetype }:
+
 stdenv.mkDerivation {
   name = "ttf2pt1-3.4.4";
 
@@ -17,12 +18,13 @@ stdenv.mkDerivation {
     makeFlags="INSTDIR=$out OWNER=`id -u`"
   '';
 
-  buildInputs = [freetype];
+  buildInputs = [ freetype ];
+  
   patches = ./gentoo-makefile.patch; # also contains the freetype patch
 
   meta = { 
-      description = "True Type to Postscript Type 3 converter, fpdf";
-      homepage = "http://ttf2pt1.sourceforge.net/index.html";
-      license = "ttf2pt1";
+    description = "True Type to Postscript Type 3 converter, fpdf";
+    homepage = "http://ttf2pt1.sourceforge.net/index.html";
+    license = "ttf2pt1";
   };
 }
diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix
index 361a7b927b1..dbb46cea832 100644
--- a/pkgs/tools/misc/wv/default.nix
+++ b/pkgs/tools/misc/wv/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, zlib, imagemagick, libpng, glib, pkgconfig, libgsf
+, libxml2, bzip2 }:
 
 stdenv.mkDerivation {
   name = "wv-1.2.4";
@@ -8,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "1mn2ax6qjy3pvixlnvbkn6ymy6y4l2wxrr4brjaczm121s8hjcb7";
   };
 
-  buildInputs = [zlib imagemagick libpng glib pkgconfig libgsf libxml2 bzip2];
+  buildInputs = [ zlib imagemagick libpng glib pkgconfig libgsf libxml2 bzip2 ];
 
   meta = {
     description = "Converter from Microsoft Word formats to human-editable ones";
diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/pkgs/tools/networking/bsd-finger/default.nix
index d627235494b..fc29af989ce 100644
--- a/pkgs/tools/networking/bsd-finger/default.nix
+++ b/pkgs/tools/networking/bsd-finger/default.nix
@@ -1,17 +1,20 @@
-args: with args;
+{ stdenv, fetchurl }:
+
+# !!! Duplication: this package is almost exactly the same as `bsd-finger'.
+
 stdenv.mkDerivation rec {
-	name = "bsd-finger-0.17";
+  name = "bsd-finger-0.17";
 
-	src = fetchurl {
-		url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/${name}.tar.gz";
-		sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244";
-	};
+  src = fetchurl {
+    url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/${name}.tar.gz";
+    sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244";
+  };
 
-	NIX_CFLAGS_COMPILE="-D_GNU_SOURCE";
+  NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE";
 
-	patches = [./ubuntu-0.17-9.patch];
+  patches = [ ./ubuntu-0.17-9.patch ];
 
-	preBuild = "cd finger";
+  preBuild = "cd finger";
 
-	preInstall = '' ensureDir $out/man/man1 $out/bin '';
+  preInstall = '' ensureDir $out/man/man1 $out/bin '';
 }
diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix
index 9ce1731eb76..86430d3865c 100644
--- a/pkgs/tools/networking/iodine/default.nix
+++ b/pkgs/tools/networking/iodine/default.nix
@@ -1 +1,22 @@
-import ./iodine-0.4.1.nix
+{ stdenv, fetchurl, zlib, nettools }:
+
+stdenv.mkDerivation rec {
+  name = "iodine-0.4.1";
+
+  src = fetchurl {
+    url = "http://code.kryo.se/iodine/${name}.tar.gz";
+    sha256 = "1d0v6wbrciwd0xi9khrna956v5wy7wy1inllzrn187as358kiiv5";
+  };
+
+  buildInputs = [ zlib ];
+
+  patchPhase = ''sed -i "s,/sbin/ifconfig,${nettools}/sbin/ifconfig,; s,/sbin/route,${nettools}/sbin/route," src/tun.c'';
+
+  installFlags = "prefix=\${out}";
+
+  meta = {
+    homepage = http://code.kryo.se/iodine/;
+    description = "Tool to tunnel IPv4 data through a DNS server";
+    license = "ISC";
+  };
+}
diff --git a/pkgs/tools/networking/iodine/iodine-0.4.1.nix b/pkgs/tools/networking/iodine/iodine-0.4.1.nix
deleted file mode 100644
index e20c86debe3..00000000000
--- a/pkgs/tools/networking/iodine/iodine-0.4.1.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-args: with args;
-stdenv.mkDerivation rec {
-  name = "iodine-0.4.1";
-
-  src = fetchurl {
-    url = "http://code.kryo.se/iodine/${name}.tar.gz";
-    sha256 = "1d0v6wbrciwd0xi9khrna956v5wy7wy1inllzrn187as358kiiv5";
-  };
-
-  buildInputs = [zlib];
-
-  patchPhase = ''sed -i "s,/sbin/ifconfig,${nettools}/sbin/ifconfig,; s,/sbin/route,${nettools}/sbin/route," src/tun.c'';
-
-  installFlags = "prefix=\${out}";
-
-  meta = {
-    homepage = http://code.kryo.se/iodine/;
-    description = "iodine lets you tunnel IPv4 data through a DNS server.";
-    license = "ISC";
-  };
-}
diff --git a/pkgs/tools/networking/iperf/default.nix b/pkgs/tools/networking/iperf/default.nix
index e799e5118f9..1cb984e3d1c 100644
--- a/pkgs/tools/networking/iperf/default.nix
+++ b/pkgs/tools/networking/iperf/default.nix
@@ -1,14 +1,13 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation {
   name = "iperf-2.0.4";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://garr.dl.sourceforge.net/sourceforge/iperf/iperf-2.0.4.tar.gz;
     sha256 = "0i3r75prbyxs56rngjbrag8rg480ki3daaa924krrafng30z2liv";
   };
 
-#buildInputs =(with args; []);
-
   meta = {
     homepage = ""; 
     description = "tool to measure IP bandwidth using UDP or TCP";
diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix
index 8f4c18c06c3..b1456c0666e 100644
--- a/pkgs/tools/networking/p2p/libtorrent/default.nix
+++ b/pkgs/tools/networking/p2p/libtorrent/default.nix
@@ -1,5 +1,6 @@
-args: with args;
-stdenv.mkDerivation ( rec {
+{ stdenv, fetchurl, pkgconfig, openssl, libsigcxx }:
+
+stdenv.mkDerivation rec {
   pname = "libtorrent";
   version = "0.12.6";
 
@@ -15,4 +16,4 @@ stdenv.mkDerivation ( rec {
   meta = {
     description = "A BitTorrent library written in C++ for *nix, with a focus on high performance and good code";
   };
-})
+}
diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix
index a74bbc72523..eee5b5acbaa 100644
--- a/pkgs/tools/networking/p2p/rtorrent/default.nix
+++ b/pkgs/tools/networking/p2p/rtorrent/default.nix
@@ -1,5 +1,7 @@
-args: with args;
-stdenv.mkDerivation ( rec {
+{ stdenv, fetchurl, libtorrent, ncurses, pkgconfig, libsigcxx, curl
+, zlib, openssl }:
+
+stdenv.mkDerivation rec {
   pname = "rtorrent";
   version = "0.8.6";
 
@@ -15,4 +17,4 @@ stdenv.mkDerivation ( rec {
   meta = {
     description = "An ncurses client for libtorrent, ideal for use with screen or dtach";
   };
-})
+}
diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/tools/networking/stun/default.nix
index 8023175c52a..65a1d241c0b 100644
--- a/pkgs/tools/networking/stun/default.nix
+++ b/pkgs/tools/networking/stun/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation {
   name = "stun-0.96.dfsg-5";
 
@@ -26,11 +27,10 @@ stdenv.mkDerivation {
   };
 
   meta = {
-    description = "stun server and test client";
-    longDescription = "eg useful to debug voip trouble";
+    description = "Stun server and test client";
     homepage = http://sourceforge.net/projects/stun/;
     license = "Vovida 1.0"; # See any header file.
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/pydb/default.nix b/pkgs/tools/pydb/default.nix
index 07d9545529b..7aa2d57955f 100644
--- a/pkgs/tools/pydb/default.nix
+++ b/pkgs/tools/pydb/default.nix
@@ -1,22 +1,23 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, python, emacs }:
+
+stdenv.mkDerivation {
   name = "pydb-1.26";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url =  "mirror://sourceforge.net/sourceforge/bashdb/pydb-1.26.tar.bz2";
     sha256 = "1wlkz1hd5d4gkzhkjkzcm650c1lchj28hj36jx96mklglm41h4q1";
   };
 
-  buildInputs =(with args; [python emacs /* emacs is optional */]);
+  buildInputs = [ python emacs /* emacs is optional */ ];
 
   preConfigure = ''
     p="$(toPythonPath $out)"
-    configureFlags="$configureFlags --with-python=${args.python}/bin/python --with-site-packages=$p"
+    configureFlags="$configureFlags --with-python=${python}/bin/python --with-site-packages=$p"
   '';
 
   meta = { 
-      description = "python debugger with gdb like commands and emacs bindings";
-      homepage = http://bashdb.sourceforge.net/pydb/;
-      license = "GPLv3";
+    description = "Python debugger with GDB-like commands and Emacs bindings";
+    homepage = http://bashdb.sourceforge.net/pydb/;
+    license = "GPLv3";
   };
 }
diff --git a/pkgs/tools/text/multitran/libfacet/default.nix b/pkgs/tools/text/multitran/libfacet/default.nix
index 2111a2b8dc1..6dab8f86c32 100644
--- a/pkgs/tools/text/multitran/libfacet/default.nix
+++ b/pkgs/tools/text/multitran/libfacet/default.nix
@@ -1,7 +1,8 @@
-{stdenv, fetchurl, libmtsupport} :
+{ stdenv, fetchurl, libmtsupport }:
 
 stdenv.mkDerivation {
   name = "libfacet-0.0.1alpha2";
+  
   src = fetchurl {
     url = mirror://sourceforge/multitran/libfacet-0.0.1alpha2.tar.bz2;
     sha256 = "dc53351c4035a3c27dc6c1d0410e808346fbc107e7e7c112ec65c59d0df7a144";
@@ -15,7 +16,6 @@ stdenv.mkDerivation {
       src/Makefile;
   '';
 
-
   meta = {
     homepage = http://multitran.sourceforge.net/;
     description = "Multitran lib: enchanced locale facets";
diff --git a/pkgs/tools/text/patchutils/default.nix b/pkgs/tools/text/patchutils/default.nix
index b89ffb850a0..0ab73142ea0 100644
--- a/pkgs/tools/text/patchutils/default.nix
+++ b/pkgs/tools/text/patchutils/default.nix
@@ -1,21 +1,19 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
   name = "patchutils-0.3.0";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.3.0.tar.bz2;
     sha256 = "08jzvprhpcgwvx0xlkwc8dbdd9ilvwyr3cwnq96xmbfipch69yi7";
   };
 
-  buildInputs =(with args; []);
-
   meta = { 
-      description = "collection of programs that operate on patch files, fix"
-        + " diffs after manually editing them, create a diff of diffs etc";
-      homepage = http://cyberelk.net/tim/software/patchutils;
-      license = "GPLv2";
-      executables = [ "combinediff" "dehtmldiff" "editdiff" "espdiff"
-        "filterdiff" "fixcvsdiff" "flipdiff" "grepdiff" "interdiff" "lsdiff"
-        "recountdiff" "rediff" "splitdiff" "unwrapdiff" ];
+    description = "Tools to manipulate patch files";
+    homepage = http://cyberelk.net/tim/software/patchutils;
+    license = "GPLv2";
+    executables = [ "combinediff" "dehtmldiff" "editdiff" "espdiff"
+      "filterdiff" "fixcvsdiff" "flipdiff" "grepdiff" "interdiff" "lsdiff"
+      "recountdiff" "rediff" "splitdiff" "unwrapdiff" ];
   };
 }
diff --git a/pkgs/tools/video/swftools/default.nix b/pkgs/tools/video/swftools/default.nix
index 4249d32b3ce..806a0b21096 100644
--- a/pkgs/tools/video/swftools/default.nix
+++ b/pkgs/tools/video/swftools/default.nix
@@ -1,24 +1,18 @@
-args:
-args.stdenv.mkDerivation {
-  # snapshot version does'nt compile
-  #name = "swftools-2008-10-13-1554";
-  name = "swftools-0.8.1";
+{ stdenv, fetchurl, zlib }:
 
-  src = args.fetchurl {
-    #url = http://www.swftools.org/swftools-2008-10-13-1554.tar.gz;
-    #sha256 = "05r2qg8yc6lpj5263jyrdykr2vkq9rlyqxydx0rnfnkqpr7s6931";
+stdenv.mkDerivation {
+  name = "swftools-0.8.1";
 
+  src = fetchurl {
     url = http://www.swftools.org/swftools-0.8.1.tar.gz;
     sha256 = "0l75c3ibwd24g9nqghp1rv1dfrlicw87s0rbdnyffjv4izz6gc2l";
   };
 
-  buildInputs =(with args; [zlib 
-                            # the following are not needed to compile 0.8.1
-                            libjpeg giflib freetype]);
+  buildInputs = [ zlib ];
 
   meta = { 
-      description = "collection of SWF manipulation and creation utilities";
-      homepage = http://www.swftools.org/about.html;
-      license = "GPLv2";
-    };
+    description = "Collection of SWF manipulation and creation utilities";
+    homepage = http://www.swftools.org/about.html;
+    license = "GPLv2";
+  };
 }