* 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

10 files changed, 71 insertions, 58 deletions

diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix
index d26a0aa7fca..666f2d9475b 100644
--- a/pkgs/os-specific/linux/acpi/default.nix
+++ b/pkgs/os-specific/linux/acpi/default.nix
@@ -1,13 +1,13 @@
-args: with args;
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "acpi-0.09";
+  
   src = fetchurl {
     url = "http://grahame.angrygoats.net/source/acpi/${name}.tar.gz";
     sha256 = "11iwzbm3gcn9ljvxl4cjj9fc1n135hx45rhrsprnnkqppndf3vn1";
   };
 
-
   meta = {
     longDescription = ''
       Linux ACPI client is a small command-line
diff --git a/pkgs/os-specific/linux/afuse/default.nix b/pkgs/os-specific/linux/afuse/default.nix
index 2ecb21d2b5b..06af0c9228a 100644
--- a/pkgs/os-specific/linux/afuse/default.nix
+++ b/pkgs/os-specific/linux/afuse/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, fuse }:
+
 stdenv.mkDerivation {
   name = "afuse-0.2";
 
@@ -7,18 +8,14 @@ stdenv.mkDerivation {
     sha256 = "1lj2jdks0bgwxbjqp5a9f7qdry19kar6pg7dh1ml98gapx9siylj";
   };
 
-  buildInputs = [pkgconfig fuse];
+  buildInputs = [ pkgconfig fuse ];
 
   meta = { 
-    description = "automounting in userspace. Allows easy access to ssh-agent etc";
-    longDesc = ''
-      Example: (automunt using sshfs by accessing ~/sshfs/[user@]domain
-      afuse -o mount_template="sshfs %r:/ %m" -o unmount_template="fusermount -u -z %m" ~/sshfs/
-    '';
+    description = "Automounter in userspace";
     homepage = http://sourceforge.net/projects/afuse;
     license = "GPL-v2";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
 
diff --git a/pkgs/os-specific/linux/aufs/default.nix b/pkgs/os-specific/linux/aufs/default.nix
index 5042dd1a55e..5321bfa3d6b 100644
--- a/pkgs/os-specific/linux/aufs/default.nix
+++ b/pkgs/os-specific/linux/aufs/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, kernel}:
+{ stdenv, fetchurl, kernel }:
 
 stdenv.mkDerivation {
   name = "aufs-20090414-${kernel.version}";
diff --git a/pkgs/os-specific/linux/bridge_utils/default.nix b/pkgs/os-specific/linux/bridge_utils/default.nix
index b4f5efce22f..cb8b033c1e3 100644
--- a/pkgs/os-specific/linux/bridge_utils/default.nix
+++ b/pkgs/os-specific/linux/bridge_utils/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, autoconf, automake }:
+
 stdenv.mkDerivation {
   name = "bridge-utils-1.2";
 
@@ -7,13 +8,13 @@ stdenv.mkDerivation {
     sha256 = "0jg3z51c2c34byg4zi39j9g4b66js5kanjhid77hpa0jdfmryfy9";
   };
 
-  buildInputs = [autoconf automake];
+  buildInputs = [ autoconf automake ];
 
-  preConfigure="autoreconf";
+  preConfigure = "autoreconf";
 
   meta = { 
-      description = "http://sourceforge.net/projects/bridge/";
-      homepage = [ "http://www.linux-foundation.org/en/Net:Bridge/" "http://sourceforge.net/projects/bridge/" ];
-      license = "GPL";
+    description = "http://sourceforge.net/projects/bridge/";
+    homepage = [ "http://www.linux-foundation.org/en/Net:Bridge/" "http://sourceforge.net/projects/bridge/" ];
+    license = "GPL";
   };
 }
diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/os-specific/linux/firmware/zd1211/default.nix
index 1cffb504322..dfc384b7adb 100644
--- a/pkgs/os-specific/linux/firmware/zd1211/default.nix
+++ b/pkgs/os-specific/linux/firmware/zd1211/default.nix
@@ -1,9 +1,11 @@
-args: with args;
-stdenv.mkDerivation ( rec {
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
   pname = "zd1211-firmware";
   version = "1.4";
 
   name = "${pname}-${version}";
+  
   src = fetchurl {
     url = "http://surfnet.dl.sourceforge.net/sourceforge/zd1211/${name}.tar.bz2";
     sha256 = "866308f6f59f7075f075d4959dff2ede47735c751251fecd1496df1ba4d338e1";
@@ -18,4 +20,4 @@ stdenv.mkDerivation ( rec {
     homepage = http://sourceforge.net/projects/zd1211/;
     license = "GPL";
   };
-})
+}
diff --git a/pkgs/os-specific/linux/hal/hal-evt.nix b/pkgs/os-specific/linux/hal/hal-evt.nix
index 25b4e503326..a49f4fcc0f8 100644
--- a/pkgs/os-specific/linux/hal/hal-evt.nix
+++ b/pkgs/os-specific/linux/hal/hal-evt.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, libxml2, pkgconfig, boolstuff, hal, dbus_glib }:
+
 stdenv.mkDerivation {
   name = "hal-evt-0.1.4";
 
@@ -7,13 +8,13 @@ stdenv.mkDerivation {
     sha256 = "173dphyzpicjz5pnw0d6wmibvib5h99nh1gmyvcqpgvf8la5vrps";
   };
 
-  buildInputs = [libxml2 pkgconfig boolstuff hal dbus_glib];
+  buildInputs = [ libxml2 pkgconfig boolstuff hal dbus_glib ];
 
   meta = { 
-    description = "execute commands on hal events";
+    description = "Execute commands on hal events";
     homepage = http://www.nongnu.org/halevt/;
     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/os-specific/linux/i810switch/default.nix b/pkgs/os-specific/linux/i810switch/default.nix
new file mode 100644
index 00000000000..63a056712ac
--- /dev/null
+++ b/pkgs/os-specific/linux/i810switch/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pciutils }:
+
+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}
+  ";
+
+  src = fetchurl {
+    url = http://www16.plala.or.jp/mano-a-mano/i810switch/i810switch-0.6.5.tar.gz;
+    sha256 = "d714840e3b14e1fa9c432c4be0044b7c008d904dece0d611554655b979cad4c3";
+  };
+
+  meta = {
+    description = "A utility for switching between the LCD and external VGA display on Intel graphics cards";
+    homepage = "http://www16.plala.or.jp/mano-a-mano/i810switch.html";
+    license = "GPL2";
+  };
+}
diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/pkgs/os-specific/linux/radeontools/default.nix
index d4d39606d62..ff3cad3fe98 100644
--- a/pkgs/os-specific/linux/radeontools/default.nix
+++ b/pkgs/os-specific/linux/radeontools/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, pciutils }:
+
 stdenv.mkDerivation {
   name = "radeontool-1.5";
 
@@ -6,26 +7,26 @@ stdenv.mkDerivation {
 
   # Don't know wether it's a good idea to hardcode the lspci path..
   # But it will work on nix..
-  postUnpack = "
-    cd $sourceRoot;
-    sed -i \"s%lspci%\$pciutils/sbin/lspci%g\" radeontool.c
+  postUnpack = ''
+    cd $sourceRoot
+    sed -i "s%lspci%$pciutils/sbin/lspci%g" radeontool.c
     cd ..
-  ";
+  '';
 
   src = fetchurl {
     url = http://fdd.com/software/radeon/radeontool-1.5.tar.gz;
     sha256 = "0qbkawhhq0y0gqbbql7q04y0v0hims5c4jkjsbc1y03rf9kr10ar";
   };
 
-  installPhase = "
-    ensureDir \$out/bin
+  installPhase = ''
+    ensureDir $out/bin
     chmod +x lightwatch.pl
-    cp radeontool lightwatch.pl \$out/bin
-  ";
+    cp radeontool lightwatch.pl $out/bin
+  '';
 
   meta = { 
-      description = "Control the backlight and external video output of ATI Radeon Mobility graphics cards";
-      homepage = http://fdd.com/software/radeon/;
-      license = "ZLIB";
-    };
+    description = "Control the backlight and external video output of ATI Radeon Mobility graphics cards";
+    homepage = http://fdd.com/software/radeon/;
+    license = "ZLIB";
+  };
 }
diff --git a/pkgs/os-specific/linux/upstart/jobcontrol.nix b/pkgs/os-specific/linux/upstart/jobcontrol.nix
deleted file mode 100644
index 5be0276ffd5..00000000000
--- a/pkgs/os-specific/linux/upstart/jobcontrol.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-	name = "upstart-jobcontrol";
-	buildCommand = "
-		mkdir -p \$out/bin
-		echo '
-			file=/etc/event.d/\$1
-			shift
-			controlscript=\$(egrep exec\\|respawn \$file | tail | sed -e s/^\\\\s\\\\+//g  | sed -e s/\\\\s\\\\+/\\ /g | cut -f 2 -d \\  )
-			echo Running \$controlscript \"\$@\"
-			\$controlscript \"\$@\"
-		' >\$out/bin/jobcontrol
-		chmod a+x \$out/bin/jobcontrol
-	";
-}
diff --git a/pkgs/os-specific/linux/wvdial/default.nix b/pkgs/os-specific/linux/wvdial/default.nix
index 2b58108ba08..eb9d09d2a11 100644
--- a/pkgs/os-specific/linux/wvdial/default.nix
+++ b/pkgs/os-specific/linux/wvdial/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, wvstreams, pkgconfig }:
+
 stdenv.mkDerivation rec {
   name = "wvdial-1.61";
 
@@ -7,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0mzcrv8mc60gbdrixc9k8ammbslvjb9x2cs50yf1jq67aabapzsg";
   };
 
-  buildInputs = [wvstreams pkgconfig];
+  buildInputs = [ wvstreams pkgconfig ];
 
   preConfigure = ''
     find -type f | xargs sed -i 's@/bin/bash@bash@g'
@@ -17,10 +18,10 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "dialer automatically recognizing the modem";
+    description = "A dialer that automatically recognises the modem";
     homepage = http://alumnit.ca/wiki/index.php?page=WvDial;
     license = "LGPL";
-    maintainers = [stdenv.lib.maintainers.marcweber];
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
   };
 }