Nix-expr style review

Unneded args.something replaced with
args: with args;
line. After this line args is the only place where we can recieve variables from.

Also removed several
buildInputs = [];
lines.

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

18 files changed, 77 insertions, 82 deletions

diff --git a/pkgs/applications/editors/bvi/default.nix b/pkgs/applications/editors/bvi/default.nix
index 6d9ffdaecc81..223aabcdf82e 100644
--- a/pkgs/applications/editors/bvi/default.nix
+++ b/pkgs/applications/editors/bvi/default.nix
@@ -1,13 +1,13 @@
-args:
-args.stdenv.mkDerivation {
+args : with args;
+stdenv.mkDerivation {
   name = "bvi-1.3.2";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://prdownloads.sourceforge.net/bvi/bvi-1.3.2.src.tar.gz;
     sha256 = "110wxqnyianqamxq4y53drqqxb9vp4k2fcvic45qggvlqkqhlfgz";
   };
 
-  buildInputs =(with args; [ncurses]);
+  buildInputs = [ncurses];
 
   meta = { 
       description = "hex editor with vim style keybindings";
diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix
index 4778c4bf7c40..f82f07602f8c 100644
--- a/pkgs/applications/graphics/exrdisplay/default.nix
+++ b/pkgs/applications/graphics/exrdisplay/default.nix
@@ -1,23 +1,23 @@
-args:
+args: with args;
 
-assert args.fltk.flag_set_gl;
-args.stdenv.mkDerivation {
+assert fltk.flag_set_gl;
+stdenv.mkDerivation {
 
   name ="openexr_viewers-1.0.1";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url =  "http://download.savannah.nongnu.org/releases/openexr/openexr_viewers-1.0.1.tar.gz";
     sha256 = "1w5qbcdp7sw48z1wk2v07f7p14vqqb1m2ncxyxnbkm9f4ab0ymg6";
   };
 
-  inherit (args) fltk mesa;
+  inherit fltk mesa;
 
   configurePhase = "
     # don't know why.. adding these flags it works
     #export CXXFLAGS=`fltk-config --use-gl --cxxflags --ldflags`
     ./configure --prefix=\$out --with-fltk-config=\$fltk/bin/fltk-config";
 
-  buildInputs =(with args; [openexr fltk pkgconfig mesa which openexr_ctl]);
+  buildInputs = [openexr fltk pkgconfig mesa which openexr_ctl];
 
   meta = { 
       description = "tool to view OpenEXR images";
diff --git a/pkgs/applications/jedit/default.nix b/pkgs/applications/jedit/default.nix
index 3d694ee3ed7e..aaf558ace091 100644
--- a/pkgs/applications/jedit/default.nix
+++ b/pkgs/applications/jedit/default.nix
@@ -1,8 +1,8 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "jedit-4.2";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://kent.dl.sourceforge.net/sourceforge/jedit/jedit42source.tar.gz;
     sha256 = "1ckqghsw2r30kfkqfgjl4k47gdwpz8c1h85haw0y0ymq4rqh798j";
   };
@@ -18,7 +18,7 @@ args.stdenv.mkDerivation {
     cp modes/catalog \$out/lib/modes
   ";
 
-  buildInputs =(with args; [ant]);
+  buildInputs = [ant];
 
   meta = { 
       description = "really nice programmers editor written in Java. Give it a try";
diff --git a/pkgs/applications/jedit/wrapper.nix b/pkgs/applications/jedit/wrapper.nix
index ff8f6abacfc4..8af3d96918d8 100644
--- a/pkgs/applications/jedit/wrapper.nix
+++ b/pkgs/applications/jedit/wrapper.nix
@@ -1,18 +1,18 @@
-args:
-args.stdenv.mkDerivation {
-    name = args.jedit.name+"_startscript";
+args: with args;
+stdenv.mkDerivation {
+    name = jedit.name+"_startscript";
 
-    java = args.jre+"/bin/java";
-    jeditjar = args.jedit+"/lib/jedit.jar";
+    java = jre+"/bin/java";
+    jeditjar = jedit+"/lib/jedit.jar";
 
     phases = "buildPhase";
 
     buildPhase = "
 ensureDir \$out/bin
-cat > \$out/bin/${args.jedit.name} << EOF
+cat > \$out/bin/${jedit.name} << EOF
 #!/bin/sh
 exec $java -jar $jeditjar \\$*
 EOF
-  chmod +x \$out/bin/${args.jedit.name}
+  chmod +x \$out/bin/${jedit.name}
 ";
 }
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index e722d4ff9dbd..aa50f67719c3 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -1,18 +1,18 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "blender-2.45";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://download.blender.org/source/blender-2.45.tar.gz;
     sha256 = "1bi7j1fcvrpb96sjpcbm4sldf359sgskfhv7a8pgcxj0bnhp47wj";
   };
 
   phases="unpackPhase buildPhase";
 
-  inherit (args) scons SDL freetype openal python openexr mesa;
+  inherit scons SDL freetype openal python openexr mesa;
 
-  buildInputs =(with args; [python scons
-         gettext libjpeg libpng zlib freetype /* fmod smpeg */ freealut openal x11 mesa inputproto libtiff libXi ]);
+  buildInputs = [python scons
+         gettext libjpeg libpng zlib freetype /* fmod smpeg */ freealut openal x11 mesa inputproto libtiff libXi ];
 
   # patch SConstruct so that we can pass on additional include.  Either blender
   # or openEXR is broken. I think OpenEXR should use include "" isntead of <> to
diff --git a/pkgs/applications/misc/d4x/default.nix b/pkgs/applications/misc/d4x/default.nix
index 5a20893e9f3c..f4ad3cc8421a 100644
--- a/pkgs/applications/misc/d4x/default.nix
+++ b/pkgs/applications/misc/d4x/default.nix
@@ -1,10 +1,10 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "d4x-2.5.7.1";
   
-  inherit (args) boost;
+  inherit boost;
 
-  src = args.fetchurl {
+  src = fetchurl {
     url =  http://d4x.krasu.ru/files/d4x-2.5.7.1.tar.bz2;
     sha256 = "1i1jj02bxynisqapv31481sz9jpfp3f023ky47spz1v1wlwbs13m";
   };
@@ -12,7 +12,7 @@ args.stdenv.mkDerivation {
   configurePhase = "./configure --prefix=\$out "
     + " --with-boost-libdir=\$boost/lib"
     + " --with-boost-includedir=\$boost/include";
-  buildInputs =(with args; [gtk glib pkgconfig openssl boost]);
+  buildInputs = [gtk glib pkgconfig openssl boost];
 
   meta = { 
       description = "graphical download manager";
diff --git a/pkgs/applications/misc/flite/default.nix b/pkgs/applications/misc/flite/default.nix
index 291cce6c1f9e..ad3b9df164d4 100644
--- a/pkgs/applications/misc/flite/default.nix
+++ b/pkgs/applications/misc/flite/default.nix
@@ -1,8 +1,8 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "flite-1.3-release";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://www.speech.cs.cmu.edu/flite/packed/flite-1.3/flite-1.3-release.tar.gz;
     sha256 = "12wanxx57bbqgkag54dlqzv6h2kr9053p0z8mkxs0mqy03vja8lj";
   };
@@ -18,8 +18,6 @@ args.stdenv.mkDerivation {
     cp -r bin \$out
   ";
 
-  buildInputs = (with args; []);
-
   meta = { 
       description = "Flite text to speech engine";
       homepage = http://www.speech.cs.cmu.edu/flite/download.html;
diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/applications/misc/freemind/default.nix
index 79b00204fd40..b7bc3f3c8dd7 100644
--- a/pkgs/applications/misc/freemind/default.nix
+++ b/pkgs/applications/misc/freemind/default.nix
@@ -1,15 +1,15 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "freemind-0.9.0_Beta_13";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://downloads.sourceforge.net/freemind/freemind-src-0.9.0_Beta_13_icon_butterfly.tar.gz;
     sha256 = "00389bhg73qknydrq0f3bskb5lyrdg2p58mnnp19wdvzzmfbic4w";
   };
 
-  buildInputs =(with args; [jdk ant]);
+  buildInputs = [jdk ant];
 
-  inherit (args) jre;
+  inherit jre;
 
   phases="buildPhase installPhase";
 
diff --git a/pkgs/applications/misc/mrxvt/default.nix b/pkgs/applications/misc/mrxvt/default.nix
index aaabef2b6b8c..f58fff56bc08 100644
--- a/pkgs/applications/misc/mrxvt/default.nix
+++ b/pkgs/applications/misc/mrxvt/default.nix
@@ -10,11 +10,11 @@ let
     };
 };
 
-in args.stdenv.mkDerivation {
+in stdenv.mkDerivation {
 
   inherit (co) buildInputs configureFlags;
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = mirror://sourceforge/materm/mrxvt-0.5.3.tar.gz;
     sha256 = "04flnn58hp4qvvk6jzyipsj13v1qyrjabgbw5laz5cqxvxzpncp2";
   };
diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix
index 733bf02a0543..d60a3ca15487 100644
--- a/pkgs/applications/misc/pgadmin/default.nix
+++ b/pkgs/applications/misc/pgadmin/default.nix
@@ -1,14 +1,14 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "pgadmin3-1.8.1";
 
-  src = args.fetchurl {
+  src = fetchurl {
     name = "pgadmin3-v1.8.1.tar.gz";
     url = "http://ftp3.de.postgresql.org/pub/Mirrors/ftp.postgresql.org//pgadmin3/release/v1.8.1/src/pgadmin3-1.8.1.tar.gz";
     sha256 = "1vnpbgb2ksvcgbzab4jjspwvs5cvam53azinfavjad4kpjczdywb";
   };
 
-  buildInputs =(with args; [postgresql wxGTK libxml2 libxslt openssl]);
+  buildInputs = [postgresql wxGTK libxml2 libxslt openssl];
 
   meta = { 
       description = "postgresql admin gui tool";
diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix
index c59148e854e4..c26876f2fcb4 100644
--- a/pkgs/applications/misc/pstree/default.nix
+++ b/pkgs/applications/misc/pstree/default.nix
@@ -1,14 +1,13 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "pstree-2.31";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://fresh.t-systems-sfr.com/unix/src/misc/pstree-2.31.tar.gz;
     sha256 = "1zzz29gsyra8csk54cyq0pcdxxg3l4gmksq8q1skv2z84g2yxdhh";
   };
 
   unpackPhase="unpackFile \$src; sourceRoot=.";
-  #buildInputs =(with args; []);
   
   buildPhase="pwd; gcc -o pstree pstree.c";
   installPhase="ensureDir \$out/bin; cp pstree \$out/bin";
diff --git a/pkgs/applications/misc/rxvt/default.nix b/pkgs/applications/misc/rxvt/default.nix
index c875e55a8cb0..58366c6aa048 100644
--- a/pkgs/applications/misc/rxvt/default.nix
+++ b/pkgs/applications/misc/rxvt/default.nix
@@ -1,13 +1,13 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "rxvt-2.6.4";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://downloads.sourceforge.net/rxvt/rxvt-2.6.4.tar.gz;
     sha256 = "0hi29whjv8v11nkjbq1i6ms411v6csykghmlpkmayfjn9nxr02xg";
   };
 
-  buildInputs =(with args; [ libX11 libXt ]);
+  buildInputs = [ libX11 libXt ];
 
   meta = { 
       description = "colour vt102 terminal emulator with less features and lower memory consumption";
diff --git a/pkgs/applications/misc/sbagen/default.nix b/pkgs/applications/misc/sbagen/default.nix
index d78742bfc5b9..6bf28580b350 100644
--- a/pkgs/applications/misc/sbagen/default.nix
+++ b/pkgs/applications/misc/sbagen/default.nix
@@ -1,5 +1,5 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "sbagen-1.4.4";
 
   buildPhases="buildPhase installPhase";
@@ -14,7 +14,7 @@ args.stdenv.mkDerivation {
   
    ";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://uazu.net/sbagen/sbagen-1.4.4.tgz;
     sha256 = "0w62yk1b0hq79kl0angma897yqa8p1ww0dwydf3zlwav333prkd2";
   };
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index 7872c6abaaf7..be0c449abc76 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -1,15 +1,15 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "synergy-cvs";
 
-  src = args.fetchcvs {
+  src = fetchcvs {
     url = ":pserver:anonymous@synergy2.cvs.sourceforge.net:/cvsroot/synergy2";
     module = "synergy";
     date = "NOW";
     sha256 = "ef8e2ebfda6e43240051a7af9417092b2af50ece8b5c6c3fbd908ba91c4fe068";
   };
 
-  buildInputs =(with args; [x11 xextproto libXtst inputproto]);
+  buildInputs = [x11 xextproto libXtst inputproto];
 
   meta= { 
       description = "share mouse keyboard and clipboard between computers";
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index bbdd265f7dab..2763969ddecc 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -33,18 +33,18 @@ Sincerly
 Marc Weber (small nix contributor)
 */
 
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "teamspeak-client-rc2-2032";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = ftp://213.202.254.114/teamspeak/releases/ts2_client_rc2_2032.tar.bz2;
     md5 = "e93d17a25e07b1cbe400e4eb028ca8f8";
   };
 
   phases="installPhase";
 
-  rpathInputs = (with args; [ glibc x11 ] );
+  rpathInputs = [ glibc x11 ];
 
   installPhase="
     set -x
diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index 523620a403e0..67839833c319 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -1,14 +1,12 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "msmtp-1.4.13";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://dfn.dl.sourceforge.net/sourceforge/msmtp/msmtp-1.4.13.tar.bz2;
     sha256 = "1x8q8dhcpnjym3icz6070l13hz98fvdvgc5j5psj4pmxbswx0r4p";
   };
 
-  buildInputs =(with args; []);
-
   meta = { 
       description = "a MUA";
       homepage = http://msmtp.sourceforge.net/;
diff --git a/pkgs/applications/networking/skype/default.nix b/pkgs/applications/networking/skype/default.nix
index 443c92527f2e..285cba82a3fe 100644
--- a/pkgs/applications/networking/skype/default.nix
+++ b/pkgs/applications/networking/skype/default.nix
@@ -1,16 +1,16 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "skype-1.4";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://www.skype.com/go/getskype-linux-static;
     sha256 = "0k71byzaipmw8lb92aad4qyh9rk0fnn3za74v1h268h09gkkd8mz";
     name = "skype_static-1.4.0.99.tar.bz2";
   };
 
-  buildInputs =(with args; [alsaLib glibc libSM libICE libXi libXrender libXrandr libXfixes 
+  buildInputs = [alsaLib glibc libSM libICE libXi libXrender libXrandr libXfixes 
       libXcursor libXinerama freetype fontconfig libXext libX11 
-    fontconfig libXinerama libsigcxx gcc41.gcc ]);
+    fontconfig libXinerama libsigcxx gcc41.gcc ];
 
   phases = "installPhase";
   installPhase ="
diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix
index 8e501f40cc0e..cac769d60de3 100644
--- a/pkgs/applications/video/kino/default.nix
+++ b/pkgs/applications/video/kino/default.nix
@@ -51,19 +51,19 @@
 #AMR-WB IF2 support        no
 
 
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "kino-1.2.0";
 
   phases = "unpackPhase configurePhase buildPhase installPhase";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://downloads.sourceforge.net/kino/kino-1.2.0.tar.gz;
     sha256 = "15q1qmii5a2zbrrrg8iba2d1rjzaisa75zvxjhrs86jwglpn4lp9";
   };
 
-  buildInputs =(with args; [ gtk libglade libxml2 libraw1394 libsamplerate libdv 
-      pkgconfig perl perlXMLParser libavc1394 libiec61883 x11 libXv gettext libX11 glib cairo ]); # TODOoptional packages 
+  buildInputs = [ gtk libglade libxml2 libraw1394 libsamplerate libdv 
+      pkgconfig perl perlXMLParser libavc1394 libiec61883 x11 libXv gettext libX11 glib cairo ]; # TODOoptional packages 
 
   #preConfigure = "
   #  grep 11 env-vars