Cleaned up the unspecified-extra-argument calls where there is no way to access extra arguments. Tarball and full instantiation checks passed.

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

pkgs/development/interpreters/perl-5.10/default.nix

@@ -1,5 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl }:
-  , ...}:
 
 let 
   

pkgs/development/interpreters/python/2.6/default.nix

@@ -11,7 +11,6 @@
 , arch ? null
 , sw_vers ? null
 , ncurses ? null
-, ...
 }:
 
 assert zlibSupport -> zlib != null;

pkgs/development/libraries/avahi/default.nix

@@ -1,6 +1,6 @@
 { fetchurl, stdenv, pkgconfig, libdaemon, dbus, perl, perlXMLParser
 , expat, gettext, intltool, glib, gtk, qt4 ? null, lib
-, qt4Support ? false, ...}:
+, qt4Support ? false }:
 
 assert qt4Support -> qt4 != null;
 

pkgs/development/libraries/cairo/default.nix

@@ -4,7 +4,6 @@
 , xcbSupport ? false
 , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype
 , zlib, libpng, pixman, libxcb ? null, xcbutil ? null
-, ...
 }:
 
 assert postscriptSupport -> zlib != null;

pkgs/development/libraries/consolekit/default.nix

@@ -1,6 +1,5 @@
 { stdenv, fetchurl, pkgconfig, dbus_glib, zlib, pam, glib, 
-  libX11, polkit, expat
+  libX11, polkit, expat }:
-  , ...}:
 
 stdenv.mkDerivation rec {
   name = "consolekit-0.4.1";

pkgs/development/libraries/enchant/default.nix

@@ -1,5 +1,4 @@
-{ stdenv, fetchurl, aspell, pkgconfig, glib,
+{ stdenv, fetchurl, aspell, pkgconfig, glib }:
-  ...}:
 
 stdenv.mkDerivation rec {
   name = "enchant-1.3.0";

pkgs/development/libraries/freetype/default.nix

@@ -5,7 +5,6 @@
   # option allows them to be enabled.  See
   # http://www.freetype.org/patents.html.
   useEncumberedCode ? false
-  , ...
 }:
 
 stdenv.mkDerivation (rec {

pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix

@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, gstPluginsBase, bzip2, ... }:
+{ fetchurl, stdenv, pkgconfig, gstPluginsBase, bzip2 }:
 
 stdenv.mkDerivation rec {
   name = "gst-ffmpeg-0.10.9";

pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix

@@ -1,7 +1,7 @@
 { fetchurl, stdenv, pkgconfig, python, gstreamer
 , libX11, libXv, libXext, alsaLib, cdparanoia , libogg
 , libtheora, libvorbis, freetype, pango
-, liboil, gtk, which, gtkdoc, ... }:
+, liboil, gtk, which, gtkdoc }:
 
 stdenv.mkDerivation rec {
   name = "gst-plugins-base-0.10.26";

pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix

@@ -1,7 +1,7 @@
 { fetchurl, stdenv, pkgconfig, gstPluginsBase, aalib, cairo
 , flac , hal, libjpeg, zlib, speex, libpng, libdv, libcaca, dbus
 , libiec61883, libavc1394, ladspaH, taglib, gdbm, pulseaudio
-, libsoup, libcap, libtasn1, ...
+, libsoup, libcap, libtasn1
 }:
 
 stdenv.mkDerivation rec {

pkgs/development/libraries/gstreamer/gstreamer/default.nix

@@ -1,5 +1,5 @@
 { fetchurl, stdenv, perl, bison, flex, pkgconfig, python
-, which, gtkdoc, glib, libxml2, ... }:
+, which, gtkdoc, glib, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "gstreamer-0.10.26";

pkgs/development/libraries/libjpeg/default.nix

@@ -1,5 +1,4 @@
-{ stdenv, fetchurl,
+{ stdenv, fetchurl }: 
-  ...}: 
 
 stdenv.mkDerivation {
   name = "libjpeg-8";

pkgs/development/libraries/liboil/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, glib, ...}:
+{stdenv, fetchurl, pkgconfig, glib }:
 
 stdenv.mkDerivation rec {
   name = "liboil-0.3.15";

pkgs/development/libraries/libxml2/default.nix

@@ -1,5 +1,4 @@
-{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true
+{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true }:
-  , ...}:
 
 assert pythonSupport -> python != null;
 

pkgs/development/libraries/libxslt/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libxml2, ...}:
+{stdenv, fetchurl, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "libxslt-1.1.26";

pkgs/development/libraries/openssl/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, ...}:
+{ stdenv, fetchurl, perl }:
 
 let
   opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]

pkgs/development/libraries/policykit/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, expat, pam
-, intltool, gettext, libxslt, docbook_xsl, ... }:
+, intltool, gettext, libxslt, docbook_xsl }:
 
 stdenv.mkDerivation rec {
   name = "policykit-0.9";

pkgs/development/tools/documentation/doxygen/default.nix

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   patches = [ ./tmake.patch ];
 
   buildInputs = [ graphviz perl flex bison libX11 libXext ]
-    ++ (if qt != null then [ qt ] else []);
+    ++ (if (qt != null) then [ qt ] else []);
 
   prefixKey = "--prefix ";
   configureFlags = "--release"
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
 		 ;
 
   preConfigure =
-   (if qt == null
+   (if (qt == null)
     then ""
     else ''
       echo "using QTDIR=${qt}..."
       export QTDIR=${qt}
-    '');
+    ''); 
       # export CPLUS_INCLUDE_PATH="${qt}/include:$CPLUS_INCLUDE_PATH"
       # export LIBRARY_PATH="${qt}/lib:$LIBRARY_PATH"
 

pkgs/development/tools/misc/gnum4/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ...}:
+{stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "gnum4-1.4.13";