* 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

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";
+  };
+}

pkgs/tools/networking/iodine/iodine-0.4.1.nix

@@ -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";
-  };
-}