Update/fix Uzbl

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33340

pkgs/applications/networking/browsers/uzbl/default.nix

@@ -1,17 +1,20 @@
 a :  
 let 
-  fetchurl = a.fetchurl;
-
-  s = import ./src-for-default.nix;
+  fetchgit = a.fetchgit;
 
   buildInputs = with a; [
-    libsoup pkgconfig webkit gtk makeWrapper
+    libsoup pkgconfig webkit gtk3 makeWrapper
     kbproto
   ];
 in
 rec {
-  src = (a.fetchUrlFromSrcInfo s);
-  inherit (s) name;
+  src = fetchgit {
+    url = "https://github.com/Dieterbe/uzbl.git";
+    rev = "dcb3b4e1fcff682b412cfe5875f7054b97380d08";
+    sha256 = "f7b2b2903c01c9cfbd99bd94783002e1580d8092ff6022bb5aed3f999ff6e468";
+  };
+
+  name = "uzbl-git";
 
   inherit buildInputs;
   configureFlags = [];

pkgs/applications/networking/browsers/uzbl/src-for-default.nix

@@ -1,10 +0,0 @@
-rec {
-   version="2010.04.03";
-   name="uzbl-stable-2010.04.03";
-   hash="1jxs9agk4jd09v73vl69k3mil4jfr5rhfb0v4sq8sfh1p8nl389s";
-   url="http://github.com/Dieterbe/uzbl/tarball/${version}";
-   advertisedUrl="http://github.com/Dieterbe/uzbl/tarball/2010.04.03";
-  
-   downloadName="2010.04.03.tar.gz";
-  
-}

pkgs/applications/networking/browsers/uzbl/src-info-for-default.nix

@@ -1,9 +0,0 @@
-{
-  baseName = "uzbl-stable";
-  downloadPage = "http://github.com/Dieterbe/uzbl/downloads";
-  sourceRegexp = "/tarball/";
-  versionExtractorSedScript = ''s@.*[/]@@'';
-  versionReferenceCreator = ''$(replaceAllVersionOccurences)'';
-  extraVars = "downloadName";
-  eval_downloadName = ''downloadName=$version.tar.gz'';
-}

pkgs/top-level/all-packages.nix

@@ -7411,7 +7411,7 @@ let
 
   uzbl = builderDefsPackage (import ../applications/networking/browsers/uzbl) {
     inherit pkgconfig webkit makeWrapper glib_networking;
-    inherit gtk glib;
+    inherit gtk3 glib;
     inherit (xlibs) libX11 kbproto;
     inherit (gnome) libsoup;
   };