Make WebKit use libsoup 2.31.2 via deepOverride. Edit a few packages that were overridable but did not allow extra arguments. Remove a catch with deepOverride that pkgs.lib had this attribute in a different sense.

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

12 files changed, 17 insertions, 9 deletions

diff --git a/pkgs/development/interpreters/perl-5.10/default.nix b/pkgs/development/interpreters/perl-5.10/default.nix
index 31168291e3d1..89e6335c703c 100644
--- a/pkgs/development/interpreters/perl-5.10/default.nix
+++ b/pkgs/development/interpreters/perl-5.10/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl
+  , ...}:
 
 let 
   
diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index 8865738b0d75..3b94d0f8477a 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -11,6 +11,7 @@
 , arch ? null
 , sw_vers ? null
 , ncurses ? null
+, ...
 }:
 
 assert zlibSupport -> zlib != null;
diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index f481c8d65e3b..54bf25500358 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
       pkgconfig libdaemon dbus perl perlXMLParser glib expat
       gettext intltool
     ]
-    ++ lib.optional qt4Support qt4;
+    ++ (lib.optional qt4Support qt4);
 
   configureFlags =
     [ "--disable-qt3" "--disable-gdbm" "--disable-gtk" "--disable-mono"
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index dc8bb2a9b523..a14b7fdc2da3 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -4,6 +4,7 @@
 , xcbSupport ? false
 , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype
 , zlib, libpng, pixman, libxcb ? null, xcbutil ? null
+, ...
 }:
 
 assert postscriptSupport -> zlib != null;
diff --git a/pkgs/development/libraries/consolekit/default.nix b/pkgs/development/libraries/consolekit/default.nix
index 5cebc5874bd7..308234890575 100644
--- a/pkgs/development/libraries/consolekit/default.nix
+++ b/pkgs/development/libraries/consolekit/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, pkgconfig, dbus_glib, zlib, pam, glib, 
-  libX11, polkit, expat }:
+  libX11, polkit, expat
+  , ...}:
 
 stdenv.mkDerivation rec {
   name = "consolekit-0.4.1";
diff --git a/pkgs/development/libraries/enchant/default.nix b/pkgs/development/libraries/enchant/default.nix
index 388d042d3aca..65aa7cd572ee 100644
--- a/pkgs/development/libraries/enchant/default.nix
+++ b/pkgs/development/libraries/enchant/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, aspell, pkgconfig, glib }:
+{ stdenv, fetchurl, aspell, pkgconfig, glib,
+  ...}:
 
 stdenv.mkDerivation rec {
   name = "enchant-1.3.0";
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index d3814bdb9724..d88fa1d0ae36 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -5,6 +5,7 @@
   # option allows them to be enabled.  See
   # http://www.freetype.org/patents.html.
   useEncumberedCode ? false
+  , ...
 }:
 
 stdenv.mkDerivation (rec {
diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix
index bc3245cf76d8..d47887fd96bc 100644
--- a/pkgs/development/libraries/libjpeg/default.nix
+++ b/pkgs/development/libraries/libjpeg/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl }: 
+{ stdenv, fetchurl,
+  ...}: 
 
 stdenv.mkDerivation {
   name = "libjpeg-8";
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index f3c9c6ca652f..3481e56b3ab7 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,4 +1,5 @@
-{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true}:
+{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true
+  , ...}:
 
 assert pythonSupport -> python != null;
 
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 4e567cf6577b..4bc93869f9d5 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl }:
+{ stdenv, fetchurl, perl, ...}:
 
 let
   opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 95c891e9bc7a..94a425aaf1d4 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, static ? false}:
+{stdenv, fetchurl, static ? false, ...}:
 
 stdenv.mkDerivation {
   name = "zlib-1.2.3";
diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix
index 0c73ba1f738d..83111c916fcf 100644
--- a/pkgs/development/tools/misc/gnum4/default.nix
+++ b/pkgs/development/tools/misc/gnum4/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, ...}:
 
 stdenv.mkDerivation {
   name = "gnum4-1.4.13";