From b24d67c7727f6b57900a448e6af7cdb5fea29b9d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 17 Jun 2010 05:20:16 +0000
Subject: [PATCH] Try updating WebKit. Dependency check passes; will abuse
 Hydra to build it all.

svn path=/nixpkgs/trunk/; revision=22304
---
 pkgs/development/libraries/webkit/default.nix       | 13 +++++++++----
 .../libraries/webkit/src-for-default.nix            | 10 +++++-----
 pkgs/top-level/all-packages.nix                     |  3 ++-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix
index ead8ce20a84..2973e99ac1c 100644
--- a/pkgs/development/libraries/webkit/default.nix
+++ b/pkgs/development/libraries/webkit/default.nix
@@ -13,7 +13,7 @@ rec {
     gettext libjpeg libpng libtiff libxml2 libxslt pango
     sqlite icu gperf bison flex autoconf automake libtool 
     perl intltool pkgconfig libsoup gtkdoc libXt libproxy
-    enchant 
+    enchant python ruby
     ];
 
   propagatedBuildInputs = [
@@ -23,10 +23,15 @@ rec {
   configureCommand = "./autogen.sh ";
   configureFlags = [
     "--enable-3D-transforms"
-    "--enable-filters"
     "--enable-web-sockets"
-    # WML fails recent builds..
-    # "--enable-wml"
+    "--enable-indexeddb"
+    "--enable-image-resizer"
+    "--enable-xhtmlmp"
+    "--enable-mathml"
+    "--enable-wml"
+    "--enable-blob-slice"
+    "--enable-file-reader"
+    "--enable-file-writer"
     ];
 
   /* doConfigure should be specified separately */
diff --git a/pkgs/development/libraries/webkit/src-for-default.nix b/pkgs/development/libraries/webkit/src-for-default.nix
index 6dd81f7d852..2714ecb8c10 100644
--- a/pkgs/development/libraries/webkit/src-for-default.nix
+++ b/pkgs/development/libraries/webkit/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="r53178";
-   name="webkit-r53178";
-   hash="0452kfqd73igmkgp0v4w13lk3ycypqz4zl9hnspg7ns5vlyknqcn";
-   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r53178.tar.bz2";
-   advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r53178.tar.bz2";
+   version="r61173";
+   name="webkit-r61173";
+   hash="1gmqgf3scbac682dkbzrfkl876y46j8rxd9asjqcx7xm4m6hrlkn";
+   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r61173.tar.bz2";
+   advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r61173.tar.bz2";
   
   
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c31c697d1a0..04c8f1c8023 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5363,7 +5363,8 @@ let
     inherit freetype fontconfig gettext gperf curl
       libjpeg libtiff libpng libxml2 libxslt sqlite
       icu cairo perl intltool automake libtool
-      pkgconfig autoconf bison libproxy enchant;
+      pkgconfig autoconf bison libproxy enchant
+      python ruby;
     inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg
       gstPluginsGood;
     flex = flex2535;