* 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

17 files changed, 139 insertions, 148 deletions

diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix
index 297bc91af4b..97c39982a65 100644
--- a/pkgs/applications/audio/jackmeter/default.nix
+++ b/pkgs/applications/audio/jackmeter/default.nix
@@ -1,23 +1,20 @@
-args: with args;
+{ stdenv, fetchurl, jackaudio, pkgconfig }:
 
-let name = "jackmeter-0.3";
-in
-stdenv.mkDerivation {
-
-  inherit name;
+stdenv.mkDerivation rec {
+  name = "jackmeter-0.3";
 
   src = fetchurl {
     url = "http://www.aelius.com/njh/jackmeter/${name}.tar.gz";
     sha256 = "03siznnq3f0nnqyighgw9qdq1y4bfrrxs0mk6394pza3sz4b6sgp";
   };
 
-  buildInputs = [jackaudio pkgconfig];
+  buildInputs = [ jackaudio pkgconfig ];
 
   meta = { 
-    description = "console jack loudness meter";
+    description = "Console jack loudness meter";
     homepage = http://www.aelius.com/njh/jackmeter/;
     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/applications/audio/ladspa-plugins/ladspah.nix b/pkgs/applications/audio/ladspa-plugins/ladspah.nix
index 12ea91714a3..8cd3dcc1bfb 100644
--- a/pkgs/applications/audio/ladspa-plugins/ladspah.nix
+++ b/pkgs/applications/audio/ladspa-plugins/ladspah.nix
@@ -1,28 +1,28 @@
-args: with args;
+{ stdenv, fetchurl, builderDefs }:
+
 let 
-	src = 
-	fetchurl {
-		url = http://www.ladspa.org/ladspa_sdk/ladspa.h.txt;
-		sha256 = "1b908csn85ng9sz5s5d1mqk711cmawain2z8px2ajngihdrynb67";
-	};
+  src = fetchurl {
+    url = http://www.ladspa.org/ladspa_sdk/ladspa.h.txt;
+    sha256 = "1b908csn85ng9sz5s5d1mqk711cmawain2z8px2ajngihdrynb67";
+  };
 in
-	let localDefs = builderDefs.passthru.function {
-		buildInputs = [];
-		inherit src;
-	};
-	in with localDefs;
+  let localDefs = builderDefs.passthru.function {
+    buildInputs = [];
+    inherit src;
+  };
+  in with localDefs;
 let
-	copyFile = fullDepEntry ("
-		ensureDir \$out/include
-		cp ${src} \$out/include/ladspa.h
-	") [minInit defEnsureDir];
+  copyFile = fullDepEntry ("
+    ensureDir \$out/include
+    cp ${src} \$out/include/ladspa.h
+  ") [minInit defEnsureDir];
 in
 stdenv.mkDerivation {
-	name = "ladspa.h";
-	builder = writeScript "ladspa.h-builder"
-		(textClosure localDefs [copyFile]);
-	meta = {
-		description = "LADSPA format audio plugins";
-		inherit src;
-	};
+  name = "ladspa.h";
+  builder = writeScript "ladspa.h-builder"
+    (textClosure localDefs [copyFile]);
+  meta = {
+    description = "LADSPA format audio plugins";
+    inherit src;
+  };
 }
diff --git a/pkgs/applications/editors/bvi/default.nix b/pkgs/applications/editors/bvi/default.nix
index 223aabcdf82..4dfe3a204d3 100644
--- a/pkgs/applications/editors/bvi/default.nix
+++ b/pkgs/applications/editors/bvi/default.nix
@@ -1,4 +1,5 @@
-args : with args;
+{ stdenv, fetchurl, ncurses }:
+
 stdenv.mkDerivation {
   name = "bvi-1.3.2";
 
@@ -7,11 +8,11 @@ stdenv.mkDerivation {
     sha256 = "110wxqnyianqamxq4y53drqqxb9vp4k2fcvic45qggvlqkqhlfgz";
   };
 
-  buildInputs = [ncurses];
+  buildInputs = [ ncurses ];
 
   meta = { 
-      description = "hex editor with vim style keybindings";
-      homepage = http://bvi.sourceforge.net/download.html;
-      license = "GPL2";
+    description = "Hex editor with vim style keybindings";
+    homepage = http://bvi.sourceforge.net/download.html;
+    license = "GPL2";
   };
 }
diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix
index c43b7f86914..f49919b70bb 100644
--- a/pkgs/applications/editors/jedit/default.nix
+++ b/pkgs/applications/editors/jedit/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, ant }:
+
 stdenv.mkDerivation {
   name = "jedit-4.2";
 
@@ -18,11 +19,11 @@ stdenv.mkDerivation {
     cp modes/catalog \$out/lib/modes
   ";
 
-  buildInputs = [ant];
+  buildInputs = [ ant ];
 
   meta = { 
-      description = "really nice programmers editor written in Java. Give it a try";
-      homepage = http://www.jedit.org;
-      license = "GPL";
+    description = "really nice programmers editor written in Java. Give it a try";
+    homepage = http://www.jedit.org;
+    license = "GPL";
   };
 }
diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 62d5347d0ea..974ced7d2b1 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, ncurses, gettext }:
+
 stdenv.mkDerivation (rec {
   pname = "nano";
   version = "2.2.3";
@@ -9,9 +10,10 @@ stdenv.mkDerivation (rec {
     url = "mirror://gnu/nano/${name}.tar.gz";
     sha256 = "1vpl993xrpj8bqi1ayga8fc0j2jag90xp6rqakzwm3bxw71hmwi2";
   };
-  buildInputs = [ncurses gettext];
-#  configureFlags = "--enable-tiny";
-  configureFlags = "
+  
+  buildInputs = [ ncurses gettext ];
+  
+  configureFlags = ''
     --disable-browser 
     --disable-help 
     --disable-justify 
@@ -20,7 +22,7 @@ stdenv.mkDerivation (rec {
     --disable-speller
     --disable-tabcomp
     --disable-wrapping
-  ";
+  '';
 
   meta = {
     homepage = http://www.nano-editor.org/;
diff --git a/pkgs/applications/misc/audio/wavesurfer/default.nix b/pkgs/applications/misc/audio/wavesurfer/default.nix
index 24429cfddad..ab22312e903 100644
--- a/pkgs/applications/misc/audio/wavesurfer/default.nix
+++ b/pkgs/applications/misc/audio/wavesurfer/default.nix
@@ -1,13 +1,14 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, snack, tcl, tk, makeWrapper }:
+
+stdenv.mkDerivation {
   name = "wavesurfer-1.8.5";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://www.speech.kth.se/wavesurfer/wavesurfer-1.8.5.tar.gz;
     sha256 = "1yx9s1j47cq0v40cwq2gn7bdizpw46l95ba4zl9z4gg31mfvm807";
   };
 
-  buildInputs =(with args; [snack tcl tk makeWrapper]);
+  buildInputs = [ snack tcl tk makeWrapper ];
 
   installPhase = ''
     ensureDir $out/{bin,nix-support,share/wavesurfer/}
@@ -15,13 +16,13 @@ args.stdenv.mkDerivation {
     mv * $out/nix-support
     ln -s $out/{nix-support,bin}/wavesurfer.tcl
     wrapProgram "$out/nix-support/wavesurfer.tcl"  \
-                 --set TCLLIBPATH "${args.snack}/lib" \
-                 --prefix PATH : "${args.tcl}/bin:${args.tk}/bin"
+                 --set TCLLIBPATH "${snack}/lib" \
+                 --prefix PATH : "${tcl}/bin:${tk}/bin"
   '';
 
   meta = { 
-      description = "tool for recording, playing, editing, viewing and labeling of audio";
-      homepage = http://www.speech.kth.se/wavesurfer/;
-      license = "BSD";
+    description = "Tool for recording, playing, editing, viewing and labeling of audio";
+    homepage = http://www.speech.kth.se/wavesurfer/;
+    license = "BSD";
   };
 }
diff --git a/pkgs/applications/misc/flite/default.nix b/pkgs/applications/misc/flite/default.nix
index ad3b9df164d..8a2414ec885 100644
--- a/pkgs/applications/misc/flite/default.nix
+++ b/pkgs/applications/misc/flite/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation {
   name = "flite-1.3-release";
 
@@ -7,20 +8,22 @@ stdenv.mkDerivation {
     sha256 = "12wanxx57bbqgkag54dlqzv6h2kr9053p0z8mkxs0mqy03vja8lj";
   };
 
-  buildPhase = "
-    unset buildPhase
-    ensureDir \$out/lib
-    buildPhase
-  ";
+  buildPhase =
+    ''
+      unset buildPhase
+      ensureDir $out/lib
+      buildPhase
+    '';
 
-  installPhase = "
-    ensureDir \$out/share/flite
-    cp -r bin \$out
-  ";
+  installPhase =
+    ''
+      ensureDir $out/share/flite
+      cp -r bin $out
+    '';
 
   meta = { 
-      description = "Flite text to speech engine";
-      homepage = http://www.speech.cs.cmu.edu/flite/download.html;
-      license = "BSD as-is";
+    description = "Flite text to speech engine";
+    homepage = http://www.speech.cs.cmu.edu/flite/download.html;
+    license = "BSD as-is";
   };
 }
diff --git a/pkgs/applications/misc/i810/default.nix b/pkgs/applications/misc/i810/default.nix
deleted file mode 100644
index 9407b8137d1..00000000000
--- a/pkgs/applications/misc/i810/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-args: with args; stdenv.mkDerivation {
-  name = "i810switch-0.6.5";
-
-  phases = "unpackPhase installPhase";
-
-  installPhase = "
-    sed -i -e 's+/usr++' Makefile
-    sed -i -e 's+^\\(.*putenv(\"PATH=\\).*$+\\1${pciutils}/sbin\");+' i810switch.c
-    make clean
-    make install DESTDIR=\${out}
-  ";
-
-  inherit pciutils;
-
-  src = fetchurl {
-    url = http://www16.plala.or.jp/mano-a-mano/i810switch/i810switch-0.6.5.tar.gz;
-    sha256 = "d714840e3b14e1fa9c432c4be0044b7c008d904dece0d611554655b979cad4c3";
-  };
-
-  meta = {
-    description = "i810switch is a utility for switching the LCD and external VGA display.";
-    homepage = "http://www16.plala.or.jp/mano-a-mano/i810switch.html";
-    license = "GPL2";
-  };
-}
diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix
index 94b68fc6bc9..6d4fa97c8cb 100644
--- a/pkgs/applications/misc/pgadmin/default.nix
+++ b/pkgs/applications/misc/pgadmin/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl }:
+
 stdenv.mkDerivation rec {
   name = "pgadmin3-1.10.0";
 
@@ -7,11 +8,11 @@ stdenv.mkDerivation rec {
     sha256 = "1ndi951da3jw5800fjdgkbvl8n6k71x7x16ghihi1l88bilf2a16";
   };
 
-  buildInputs = [postgresql wxGTK libxml2 libxslt openssl];
+  buildInputs = [ postgresql wxGTK libxml2 libxslt openssl ];
 
   meta = { 
-      description = "postgresql admin gui tool";
-      homepage = http://www.pgadmin.org;
-      license = "GPL2";
-    };
+    description = "PostgreSQL administration GUI tool";
+    homepage = http://www.pgadmin.org;
+    license = "GPL2";
+  };
 }
diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix
index 1ccbfd41728..15bcc477bdd 100644
--- a/pkgs/applications/misc/procmail/default.nix
+++ b/pkgs/applications/misc/procmail/default.nix
@@ -1,6 +1,7 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation {
-  name="procmail-3.22";
+  name = "procmail-3.22";
 
   buildInputs = [ stdenv.gcc.libc ];
 
diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix
index 71cac8eefa7..67d3f32d53f 100644
--- a/pkgs/applications/misc/pstree/default.nix
+++ b/pkgs/applications/misc/pstree/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation rec {
   name = "pstree-2.33";
 
@@ -7,15 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "1469lrhpy6wghlvbjx6lmvh27rakq00x11cpz4n965fg11i121hg";
   };
 
-  unpackPhase="unpackFile \$src; sourceRoot=.";
+  unpackPhase = "unpackFile \$src; sourceRoot=.";
 
-  buildPhase="pwd; gcc -o pstree pstree.c";
-  installPhase="ensureDir \$out/bin; cp pstree \$out/bin";
+  buildPhase = "pwd; gcc -o pstree pstree.c";
+  installPhase = "ensureDir \$out/bin; cp pstree \$out/bin";
 
   meta = {
-      description = "show the running processes as tree";
-      # don't know the correct homepage..
-      homepage = http://fresh.t-systems-sfr.com/unix/src/misc/pstree-2.32.tar.gz;
-      license = "GPL";
-    };
+    description = "Show the set of running processes as a tree";
+    license = "GPL";
+  };
 }
diff --git a/pkgs/applications/misc/sbagen/default.nix b/pkgs/applications/misc/sbagen/default.nix
index 6bf28580b35..c14f6080b8c 100644
--- a/pkgs/applications/misc/sbagen/default.nix
+++ b/pkgs/applications/misc/sbagen/default.nix
@@ -1,18 +1,18 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation {
   name = "sbagen-1.4.4";
 
-  buildPhases="buildPhase installPhase";
+  buildPhases = "buildPhase installPhase";
 
-  buildPhase="./mk";
+  buildPhase = "./mk";
 
-  installPhase="
-    ensureDir \$out/{bin,share/sbagen/doc}
-    cp -r --target-directory=\$out/share/sbagen examples scripts river1.ogg river2.ogg
+  installPhase = ''
+    ensureDir $out/{bin,share/sbagen/doc}
+    cp -r --target-directory=$out/share/sbagen examples scripts river1.ogg river2.ogg
     cp sbagen $out/bin
-    cp --target-directory=\$out/share/sbagen/doc README.txt SBAGEN.txt theory{,2}.txt {wave,holosync,focus,TODO}.txt
-  
-   ";
+    cp --target-directory=$out/share/sbagen/doc README.txt SBAGEN.txt theory{,2}.txt {wave,holosync,focus,TODO}.txt
+  '';
 
   src = fetchurl {
     url = http://uazu.net/sbagen/sbagen-1.4.4.tgz;
@@ -20,8 +20,8 @@ stdenv.mkDerivation {
   };
 
   meta = { 
-      description = "binaural sound generator";
-      homepage = http://uazu.net/sbagen;
-      license = "GPL";
-    };
+    description = "Binaural sound generator";
+    homepage = http://uazu.net/sbagen;
+    license = "GPL";
+  };
 }
diff --git a/pkgs/applications/misc/thinking-rock/default.nix b/pkgs/applications/misc/thinking-rock/default.nix
index 553e297cf7f..2faed53b7a5 100644
--- a/pkgs/applications/misc/thinking-rock/default.nix
+++ b/pkgs/applications/misc/thinking-rock/default.nix
@@ -1,8 +1,9 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
   name = "thinkingrock-2.2.1-binary";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = mirror://sourceforge/thinkingrock/ThinkingRock/TR%202.2.1/tr-2.2.1.tar.gz;
     sha256 = "0hnwvvyc8miiz8w2g4iy7s4rgfy0kfbncgbgfzpsq6nrzq334kgm";
   };
@@ -28,11 +29,12 @@ args.stdenv.mkDerivation {
     EOF
     chmod +x $out/bin/thinkingrock
   '';
+  
   installPhase = ":";
 
   meta = { 
-      description = "task managing system";
-      homepage = http://www.thinkingrock.com.au/;
-      license = "CDDL"; # Common Development and Distribution License
+    description = "Task management system";
+    homepage = http://www.thinkingrock.com.au/;
+    license = "CDDL"; # Common Development and Distribution License
   };
 }
diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix
index c5b9894a796..9fb59fcdb86 100644
--- a/pkgs/applications/networking/browsers/elinks/default.nix
+++ b/pkgs/applications/networking/browsers/elinks/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, python, perl, ncurses, x11, bzip2, zlib, openssl
+, spidermonkey, guile, gpm }:
 
 stdenv.mkDerivation rec {
   name = "elinks-0.12pre5";
@@ -8,13 +9,17 @@ stdenv.mkDerivation rec {
     sha256 = "1li4vlbq8wvnigxlkzb15490y90jg6y9yzzrqpqcz2h965w5869d";
   };
 
-  buildInputs = [python perl ncurses x11 bzip2 zlib openssl spidermonkey guile gpm];
-  configureFlags = "--enable-finger --enable-html-highlight --with-guile
-  --with-perl --with-python --enable-gopher --enable-cgi --enable-bittorrent
-  --enable-nntp --with-openssl=${openssl}";
+  buildInputs = [ python perl ncurses x11 bzip2 zlib openssl spidermonkey guile gpm ];
+  
+  configureFlags =
+    ''
+      --enable-finger --enable-html-highlight --with-guile
+      --with-perl --with-python --enable-gopher --enable-cgi --enable-bittorrent
+      --enable-nntp --with-openssl=${openssl}
+    '';
 
   meta = {
-    description = "Full-Featured Text WWW Browser";
+    description = "Full-featured text-mode web browser";
     homepage = http://elinks.or.cz;
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
index d842dc9364b..02fbc9643b7 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
@@ -1,10 +1,10 @@
-args: with args;
+{ stdenv, fetchurl, pidgin, intltool, libxml2 }:
+
+let version = "1.10.0"; in
 
-let
-  version = "1.10.0";
-in
 stdenv.mkDerivation {
   name = "pidgin-sipe-${version}";
+  
   src = fetchurl {
     url = "mirror://sourceforge/sipe/sipe/pidgin-sipe-${version}/pidgin-sipe-${version}.tar.gz";
     sha256 = "11d85qxix1dmwvzs3lx0sycsx1d5sy67r9y78fs7z716py4mg9np";
diff --git a/pkgs/applications/version-management/arch/default.nix b/pkgs/applications/version-management/arch/default.nix
index 763a84fab9f..350b842a095 100644
--- a/pkgs/applications/version-management/arch/default.nix
+++ b/pkgs/applications/version-management/arch/default.nix
@@ -1,7 +1,8 @@
-args: with args;
+{ stdenv, fetchurl, which, diffutils, gnupatch, gnutar }:
 
 stdenv.mkDerivation rec {
   name = "tla-1.3.5";
+  
   src = fetchurl {
     url = "mirror://gnu/gnu-arch/" + name + ".tar.gz";
     sha256 = "01mfzj1i6p4s8191cgd5850hds1zls88hkf9rb6qx1vqjv585aj0";
@@ -10,6 +11,7 @@ stdenv.mkDerivation rec {
   patches = [ ./configure-tmpdir.patch ];
 
   buildInputs = [which];
+  
   propagatedBuildInputs = [diffutils gnupatch gnutar];
 
   # Instead of GNU Autoconf, tla uses Tom Lord's now
diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix
index 45737effcce..8c64721bc7e 100644
--- a/pkgs/applications/video/dvdauthor/default.nix
+++ b/pkgs/applications/video/dvdauthor/default.nix
@@ -1,17 +1,18 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng }:
+
+stdenv.mkDerivation {
   name = "dvdauthor-0.6.14";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = mirror://sourceforge/dvdauthor/dvdauthor-0.6.14.tar.gz;
     sha256 = "1x4flj3ja7m8rbc956a6ha3qk0k6zxd1y6sl826r6r7dyc91a6yx";
   };
 
-  buildInputs =(with args; [imagemagick libdvdread libxml2 freetype fribidi libpng]);
+  buildInputs = [ imagemagick libdvdread libxml2 freetype fribidi libpng ];
 
   meta = { 
-      description = "Tools for generating DVD files to be played on standalone DVD players";
-      homepage = http://dvdauthor.sourceforge.net/;
-      license = ["GPLv2"];
+    description = "Tools for generating DVD files to be played on standalone DVD players";
+    homepage = http://dvdauthor.sourceforge.net/;
+    license = ["GPLv2"];
   };
 }