8 files changed, 47 insertions, 47 deletions
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 227759fa959..9fc25aad64d 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, unzip }:
 
 # at runtime, need jdk
 
diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix
index ce2d36bebe8..3cfd8736d82 100644
--- a/pkgs/development/tools/misc/avrdude/default.nix
+++ b/pkgs/development/tools/misc/avrdude/default.nix
@@ -1,21 +1,22 @@
-args: with args;
+{ composableDerivation, fetchurl, yacc, flex, texLive }:
+
 let edf = composableDerivation.edf; in
+
 composableDerivation.composableDerivation {} {
   name="avrdude-5.4";
 
   src = fetchurl {
-      url = http://mirror.switch.ch/mirror/gentoo/distfiles/avrdude-5.4.tar.gz;
-      sha256 = "bee4148c51ec95999d803cb9f68f12ac2e9128b06f07afe307d38966c0833b30";
+    url = http://mirror.switch.ch/mirror/gentoo/distfiles/avrdude-5.4.tar.gz;
+    sha256 = "bee4148c51ec95999d803cb9f68f12ac2e9128b06f07afe307d38966c0833b30";
   };
 
   configureFlags = [ "--disable-dependency-tracking" ];
 
-  buildInputs = [yacc flex];
+  buildInputs = [ yacc flex ];
 
   flags =
-         edf { name = "doc"; enable = { buildInputs = texLive;  configureFlags = ["--enable-doc"]; }; }
-      // edf { name = "parport"; }
-      ;
+       edf { name = "doc"; enable = { buildInputs = texLive; configureFlags = ["--enable-doc"]; }; }
+    // edf { name = "parport"; };
 
   cfg = {
     docSupport = false; # untested
diff --git a/pkgs/development/tools/misc/cproto/default.nix b/pkgs/development/tools/misc/cproto/default.nix
index dd2856975bd..c91d826e3b3 100644
--- a/pkgs/development/tools/misc/cproto/default.nix
+++ b/pkgs/development/tools/misc/cproto/default.nix
@@ -1,20 +1,21 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, flex, bison }:
+
+stdenv.mkDerivation {
   name = "cproto-4.6";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = mirror://sourceforge/cproto/cproto-4.6.tar.gz;
     sha256 = "0ilhkx9iwc5bh65q47mf68p39iyk07d52fv00z431nl6qcb9hp9j";
   };
 
-  buildInputs =(with args; [flex bison]);
+  buildInputs = [flex bison];
 
   # patch made by Joe Khoobyar copied from gentoo bugs
-  patches= ./cproto_patch ;
+  patches = ./cproto_patch;
 
   meta = { 
-      description = "generate C function prototypes from C source code";
-      homepage = http://cproto.sourceforge.net/;
-      license = "public domain";
+    description = "Tool to generate C function prototypes from C source code";
+    homepage = http://cproto.sourceforge.net/;
+    license = "public domain";
   };
 }
diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix
index edf2ee38946..0465b6d90a8 100644
--- a/pkgs/development/tools/misc/inotify-tools/default.nix
+++ b/pkgs/development/tools/misc/inotify-tools/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation {
   name = "inotify-tools-3.13";
 
@@ -7,13 +8,10 @@ stdenv.mkDerivation {
     sha256 = "0icl4bx041axd5dvhg89kilfkysjj86hjakc7bk8n49cxjn4cha6";
   };
 
-  buildInputs = [];
-
   meta = {
-    description = "";
     homepage = http://sourceforge.net/projects/inotify-tools/;
     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/development/tools/misc/uisp/default.nix b/pkgs/development/tools/misc/uisp/default.nix
index 694dc940d92..732d3ab92c1 100644
--- a/pkgs/development/tools/misc/uisp/default.nix
+++ b/pkgs/development/tools/misc/uisp/default.nix
@@ -1,16 +1,15 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation {
   name = "uisp-20050207";
 
-  configureFlags="--disable-dependency-tracking";
-
   src = fetchurl {
     url = http://mirror.switch.ch/mirror/gentoo/distfiles/uisp-20050207.tar.gz;
     sha256 = "1bncxp5yxh9r1yrp04vvhfiva8livi1pwic7v8xj99q09zrwahvw";
   };
 
   meta = {
-    description = "tool for AVR microcontrollers which can interface to many hardware in-system programmers";
+    description = "Tool for AVR microcontrollers which can interface to many hardware in-system programmers";
     license = "GPL-2";
     homepage = http://savannah.nongnu.org/projects/uisp;
   };
diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix
index 7d4380656e3..a883024690a 100644
--- a/pkgs/development/tools/misc/usb-modeswitch/default.nix
+++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix
@@ -1,11 +1,9 @@
-args: with args;
+{ stdenv, fetchurl, libusb }:
 
 stdenv.mkDerivation {
-
   name = "usb-modeswitch-1.1.2";
 
-  src =
-    fetchurl {
+  src =fetchurl {
     url = "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-1.1.2.tar.bz2";
     sha256 = "1wzhd0r49nh5y43qrvsi3c7a29206zwd6v8xlpb8dqm40xg3j9nz";
   };
@@ -18,13 +16,11 @@ stdenv.mkDerivation {
     makeFlags="DESTDIR=$out PREFIX=$out"
   '';
 
-  buildInputs = [libusb];
+  buildInputs = [ libusb ];
 
   meta = {
-    description = "...";
-    homepage = "TODO";
     license = "GPLv2";
-    maintainers = [stdenv.lib.maintainers.marcweber];
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix
index 5d75e6ea152..4c92946008e 100644
--- a/pkgs/development/tools/misc/yodl/default.nix
+++ b/pkgs/development/tools/misc/yodl/default.nix
@@ -1,20 +1,25 @@
 # This package is only used to create the documentation of zsh-cvs
 # eg have a look at http://www.zsh.org/mla/users/2008/msg00715.html
 # latest release is newer though
-args: with args;
+
+{ stdenv, fetchurl, perl }:
+
 stdenv.mkDerivation {
   name = "yodl-2.14.3";
 
-  buildInputs = [perl];
+  buildInputs = [ perl ];
 
   src = fetchurl {
     url = "mirror://sourceforge/yodl/yodl_2.14.3.orig.tar.gz";
     sha256 = "0paypm76p34hap3d18vvks5rrilchcw6q56rvq6pjf9raqw8ynd4";
   };
-  patches = [(fetchurl {
-    url = "mirror://sourceforge/yodl/yodl_2.14.3-1.diff.gz";
-    sha256 = "176hlbiidv7p9051f04anzj4sr9dwlp9439f9mjvvgks47ac0qx4";
-  })];
+  
+  patches =
+    [ (fetchurl {
+        url = "mirror://sourceforge/yodl/yodl_2.14.3-1.diff.gz";
+        sha256 = "176hlbiidv7p9051f04anzj4sr9dwlp9439f9mjvvgks47ac0qx4";
+      })
+    ];
 
   # This doesn't isntall docs yet, do you need them?
   installPhase = ''
diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix
index a9cc8e0a408..ec302611053 100644
--- a/pkgs/development/tools/parsing/byacc/default.nix
+++ b/pkgs/development/tools/parsing/byacc/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation {
   name = "byacc-1.9";
 
@@ -7,15 +8,14 @@ stdenv.mkDerivation {
     sha256 = "d61a15ac4ac007c188d0c0e99365f016f8d327755f43032b58e400754846f736";
   };
 
-  preConfigure = [
+  preConfigure =
     ''mkdir -p $out/bin
       sed -i "s@^DEST.*\$@DEST = $out/bin/yacc@" Makefile
-    ''
-  ];
+    '';
 
   meta = { 
-      description = "Berkeley YACC";
-      homepage = http://dickey.his.com/byacc/byacc.html;
-      license = "public domain";
+    description = "Berkeley YACC";
+    homepage = http://dickey.his.com/byacc/byacc.html;
+    license = "public domain";
   };
 }