[Nix-dev] [PATCH 3/3] removing , ... }. which were introduced in commits also adding deepOverride usages. Keeping makeOverridable usages because I don't know exactly which one can be removed.

[Marc Weber]

---
 pkgs/development/libraries/avahi/default.nix       |    2 +-
 .../libraries/gstreamer/gst-ffmpeg/default.nix     |    2 +-
 .../gstreamer/gst-plugins-base/default.nix         |    2 +-
 .../libraries/gstreamer/gstreamer/default.nix      |    2 +-
 pkgs/development/libraries/policykit/default.nix   |    2 +-
 pkgs/os-specific/linux/hal/default.nix             |    1 -
 pkgs/os-specific/linux/udev/default.nix            |    2 +-
 pkgs/os-specific/linux/util-linux-ng/default.nix   |    2 +-
 pkgs/servers/pulseaudio/default.nix                |    2 +-
 pkgs/tools/networking/curl/default.nix             |    2 +-
 10 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index 410a077..1b06070 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/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;
 
diff --git a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
index c45af90..8862a38 100644
--- a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
+++ b/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";
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
index 37d0a05..f26a252 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
+++ b/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";
diff --git a/pkgs/development/libraries/gstreamer/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/gstreamer/default.nix
index 91a699f..aec2517 100644
--- a/pkgs/development/libraries/gstreamer/gstreamer/default.nix
+++ b/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";
diff --git a/pkgs/development/libraries/policykit/default.nix b/pkgs/development/libraries/policykit/default.nix
index 87e06e9..b41204c 100644
--- a/pkgs/development/libraries/policykit/default.nix
+++ b/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";
diff --git a/pkgs/os-specific/linux/hal/default.nix b/pkgs/os-specific/linux/hal/default.nix
index e764a1a..521992d 100644
--- a/pkgs/os-specific/linux/hal/default.nix
+++ b/pkgs/os-specific/linux/hal/default.nix
@@ -3,7 +3,6 @@
 , perlXMLParser, gettext, zlib, gperf, consolekit, policykit
 , libsmbios, dmidecode, udev, utillinuxng, pmutils, usbutils
 , eject
-, ...
 }:
 
 assert stdenv ? glibc;
diff --git a/pkgs/os-specific/linux/udev/default.nix b/pkgs/os-specific/linux/udev/default.nix
index d6007c9..8a79b79 100644
--- a/pkgs/os-specific/linux/udev/default.nix
+++ b/pkgs/os-specific/linux/udev/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl, gperf, pkgconfig, glib, acl, 
-  libusb, usbutils, pciutils, ...}:
+  libusb, usbutils, pciutils}:
 
 assert stdenv ? glibc;
 
diff --git a/pkgs/os-specific/linux/util-linux-ng/default.nix b/pkgs/os-specific/linux/util-linux-ng/default.nix
index 226db5f..fc4ad7c 100644
--- a/pkgs/os-specific/linux/util-linux-ng/default.nix
+++ b/pkgs/os-specific/linux/util-linux-ng/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses ? null, ... }:
+{ stdenv, fetchurl, ncurses ? null}:
 
 stdenv.mkDerivation rec {
   name = "util-linux-ng-2.17.2";
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index e2e9487..9c3f3cf 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, hal, avahi
 , gconf, liboil, gtk, libX11, libICE, libSM, libXtst, libXi, intltool, gettext
 , libcap, alsaLib, libsamplerate, libsndfile, speex
-, ...}:
+}:
 
 stdenv.mkDerivation rec {
   name = "pulseaudio-0.9.21";
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index be5d945..5edb109 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -2,7 +2,7 @@
   , zlibSupport ? false, zlib ? null
   , sslSupport ? false, openssl ? null
   , linkStatic ? false
-  , ...}:
+  }:
 
 assert zlibSupport -> zlib != null;
 assert sslSupport -> openssl != null;
-- 
1.7.1