Update WebKit to latest and use Git checkout for libsoup

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

5 files changed, 31 insertions, 8 deletions

diff --git a/pkgs/build-support/upstream-updater/update-upstream-data.sh b/pkgs/build-support/upstream-updater/update-upstream-data.sh
index c17b6696bc475..4aad91fdac2bb 100755
--- a/pkgs/build-support/upstream-updater/update-upstream-data.sh
+++ b/pkgs/build-support/upstream-updater/update-upstream-data.sh
@@ -9,6 +9,8 @@ defs_file="$main_dir"/src-info-for-"$file_name"
 src_file="$main_dir"/src-for-"$file_name"
 new_src_file="$main_dir"/updated-src-for-"$file_name"
 
+forcedUrl="$2"
+
 defs_dir="$("$own_dir"/attrset-to-dir.sh "$defs_file")"
 src_defs_dir="$("$own_dir"/attrset-to-dir.sh "$src_file")"
 
@@ -19,11 +21,15 @@ getAttr () {
     echo "$data"
 }
 
-freshUrl="$("$own_dir"/urls-from-page.sh "$(getAttr downloadPage)" |
-  egrep "$(getAttr sourceRegexp '.*[.]tar[.].*')" | 
-  sh -c "$(getAttr choiceCommand 'head -1')")"
+if [ -z "$forcedUrl" ] ; then
+    freshUrl="$("$own_dir"/urls-from-page.sh "$(getAttr downloadPage)" |
+      egrep "$(getAttr sourceRegexp '.*[.]tar[.].*')" | 
+      sh -c "$(getAttr choiceCommand 'head -1')")"
 
-echo "Found download link: $freshUrl" >&2
+    echo "Found download link: $freshUrl" >&2
+else
+    freshUrl="$forcedUrl"
+fi
 
 if [ x"$freshUrl" = x"$(cat "$src_defs_dir"/advertisedUrl)" ]; then
     echo "Source link not changed" >&2
diff --git a/pkgs/desktops/gnome-2.26/default.nix b/pkgs/desktops/gnome-2.26/default.nix
index c5240689d2566..bf1762384b3a7 100644
--- a/pkgs/desktops/gnome-2.26/default.nix
+++ b/pkgs/desktops/gnome-2.26/default.nix
@@ -130,6 +130,12 @@ rec {
     inherit GConf;
   };
 
+  libsoup_git_head = import ./desktop/libsoup/git-head.nix {
+    inherit (pkgs) stdenv fetchurl pkgconfig libxml2 gnutls libproxy sqlite curl;
+    inherit (pkgs.gtkLibs) glib;
+    inherit GConf;
+  };
+
   libwnck = import ./desktop/libwnck {
     inherit (pkgs) stdenv fetchurl pkgconfig;
     inherit (pkgs.xlibs) libX11;
diff --git a/pkgs/desktops/gnome-2.26/desktop/libsoup/git-head.nix b/pkgs/desktops/gnome-2.26/desktop/libsoup/git-head.nix
new file mode 100644
index 0000000000000..60c957ec32481
--- /dev/null
+++ b/pkgs/desktops/gnome-2.26/desktop/libsoup/git-head.nix
@@ -0,0 +1,11 @@
+{stdenv, fetchgit, pkgconfig, libxml2, gnutls, libproxy, sqlite, curl, glib, GConf}:
+
+stdenv.mkDerivation {
+  name = "libsoup-2.27.git";
+  src = fetchgit {
+    url = git://git.gnome.org/libsoup;
+    revision = "3d0441b3f0c402447306f53789a47abdc573f8f3";
+    sha256 = "22379acc77cb6a381bd0abf69ae75ca8";
+  };
+  buildInputs = [ pkgconfig libxml2 gnutls libproxy sqlite curl glib GConf ];
+}
diff --git a/pkgs/development/libraries/webkit/src-for-default.nix b/pkgs/development/libraries/webkit/src-for-default.nix
index 869e720186b74..3e1c2fb472ff1 100644
--- a/pkgs/development/libraries/webkit/src-for-default.nix
+++ b/pkgs/development/libraries/webkit/src-for-default.nix
@@ -1,6 +1,6 @@
 rec {
-  advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r47388.tar.bz2";
-  version = "r47388";
+  advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r47686.tar.bz2";
+  version = "r47686";
   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-${version}.tar.bz2";
-  hash = "0apq5fg254wckpfqxgy61qd13k8srss1822dllmwcfsfk15m7mcx";
+  hash = "1h1frvvp8hfv3q2drjnrpgadgin55p7nv8747kxxhdkj4gv9dzqg";
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af1ffbf990c72..7e61a17bea5ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4125,7 +4125,7 @@ let
   };
 
   webkit = builderDefsPackage (import ../development/libraries/webkit) {
-    inherit (gnome26) libsoup;
+    inherit (gnome26) libsoup_git_head;
     inherit (gnome) gtkdoc;
     inherit (gtkLibs) gtk atk pango;
     inherit freetype fontconfig gettext gperf curl