From 6790312f3086d62548fa19aff4e36b94748c8c97 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 17 Jun 2010 04:22:08 +0000
Subject: [PATCH] Update uzbl

svn path=/nixpkgs/trunk/; revision=22301
---
 .../networking/browsers/uzbl/default.nix      |  4 +-
 .../networking/browsers/uzbl/experimental.nix | 38 -------------------
 .../browsers/uzbl/src-for-default.nix         | 11 +++---
 .../browsers/uzbl/src-for-experimental.nix    |  7 ----
 .../browsers/uzbl/src-info-for-default.nix    | 10 +++--
 .../uzbl/src-info-for-experimental.nix        |  6 ---
 6 files changed, 14 insertions(+), 62 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/uzbl/experimental.nix
 delete mode 100644 pkgs/applications/networking/browsers/uzbl/src-for-experimental.nix
 delete mode 100644 pkgs/applications/networking/browsers/uzbl/src-info-for-experimental.nix

diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix
index c23a0009e947..c330b685428b 100644
--- a/pkgs/applications/networking/browsers/uzbl/default.nix
+++ b/pkgs/applications/networking/browsers/uzbl/default.nix
@@ -9,7 +9,7 @@ let
   ];
 in
 rec {
-  src = (a.fetchGitFromSrcInfo s) + "/";
+  src = (a.fetchUrlFromSrcInfo s);
   inherit (s) name;
 
   inherit buildInputs;
@@ -21,7 +21,7 @@ rec {
   setVars = a.noDepEntry (''
   '');
 
-  doWrap = a.makeManyWrappers "$out/bin/uzbl" 
+  doWrap = a.makeManyWrappers "$out/bin/uzbl-core" 
     ''
       --prefix GST_PLUGIN_PATH : ${a.webkit.gstreamer}/lib/gstreamer-* \
       --prefix GST_PLUGIN_PATH : ${a.webkit.gstPluginsBase}/lib/gstreamer-* \
diff --git a/pkgs/applications/networking/browsers/uzbl/experimental.nix b/pkgs/applications/networking/browsers/uzbl/experimental.nix
deleted file mode 100644
index 7d467056db85..000000000000
--- a/pkgs/applications/networking/browsers/uzbl/experimental.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-a :  
-let 
-  s = import ./src-for-experimental.nix;
-  buildInputs = with a; [
-    libsoup pkgconfig webkit gtk makeWrapper
-  ];
-in
-rec {
-  src = (a.fetchGitFromSrcInfo s) + "/";
-
-  inherit (s) name;
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["setVars" "addInputs" "doMakeInstall" "doWrap"];
-
-  setVars = a.noDepEntry ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lX11"
-  '';
-      
-  doWrap = a.makeManyWrappers "$out/bin/uzbl*" 
-    ''
-      --prefix GST_PLUGIN_PATH : ${a.webkit.gstreamer}/lib/gstreamer-* \
-      --prefix GST_PLUGIN_PATH : ${a.webkit.gstPluginsBase}/lib/gstreamer-* \
-      --prefix GST_PLUGIN_PATH : ${a.webkit.gstPluginsGood}/lib/gstreamer-* \
-      --prefix GST_PLUGIN_PATH : ${a.webkit.gstFfmpeg}/lib/gstreamer-* 
-    '';
-
-  installFlags = "PREFIX=$out";
-
-  meta = {
-    description = "Tiny externally controllable webkit browser";
-    maintainers = [a.lib.maintainers.raskin];
-    platforms = with a.lib.platforms; 
-      linux;
-  };
-}
diff --git a/pkgs/applications/networking/browsers/uzbl/src-for-default.nix b/pkgs/applications/networking/browsers/uzbl/src-for-default.nix
index cb6876bb9adb..2ffc1f95380c 100644
--- a/pkgs/applications/networking/browsers/uzbl/src-for-default.nix
+++ b/pkgs/applications/networking/browsers/uzbl/src-for-default.nix
@@ -1,9 +1,10 @@
 rec {
-   version="d2d73ad463f3d9f1c673d37457af159947b3faac";
-   name="uzbl-stable-d2d73ad463f3d9f1c673d37457af159947b3faac";
-   hash="7b162ad46445b4080c0cf2ac57c777186d4a9a58979499fe5556e6e855d4e53c";
-   rev="d2d73ad463f3d9f1c673d37457af159947b3faac";
-   url="git://github.com/Dieterbe/uzbl.git";
+   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";
   
 }
diff --git a/pkgs/applications/networking/browsers/uzbl/src-for-experimental.nix b/pkgs/applications/networking/browsers/uzbl/src-for-experimental.nix
deleted file mode 100644
index 237a56aaa75c..000000000000
--- a/pkgs/applications/networking/browsers/uzbl/src-for-experimental.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-rec {
-   version="1461ac760f79b8f153c8317c4534cb047a48331a";
-   name="uzbl-experimental-1461ac760f79b8f153c8317c4534cb047a48331a";
-   hash="b5dfae5245b1b3934ca918831fbe9fa0bb7ae790c682b69f5ecc042cccf58894";
-   rev="1461ac760f79b8f153c8317c4534cb047a48331a";
-   url="git://github.com/Dieterbe/uzbl.git";
-}
diff --git a/pkgs/applications/networking/browsers/uzbl/src-info-for-default.nix b/pkgs/applications/networking/browsers/uzbl/src-info-for-default.nix
index 61ac0e15294b..48650efd146b 100644
--- a/pkgs/applications/networking/browsers/uzbl/src-info-for-default.nix
+++ b/pkgs/applications/networking/browsers/uzbl/src-info-for-default.nix
@@ -1,7 +1,9 @@
 {
-  repoUrl = "git://github.com/Dieterbe/uzbl.git";
   baseName = "uzbl-stable";
-  method = "fetchgit";
-  rev = "origin/master";
+  downloadPage = "http://github.com/Dieterbe/uzbl/downloads";
+  sourceRegexp = "/tarball/";
+  versionExtractorSedScript = ''s@.*[/]@@'';
+  versionReferenceCreator = ''$(replaceAllVersionOccurences)'';
+  extraVars = "downloadName";
+  eval_downloadName = ''downloadName=$version.tar.gz'';
 }
-
diff --git a/pkgs/applications/networking/browsers/uzbl/src-info-for-experimental.nix b/pkgs/applications/networking/browsers/uzbl/src-info-for-experimental.nix
deleted file mode 100644
index 60750f7b90be..000000000000
--- a/pkgs/applications/networking/browsers/uzbl/src-info-for-experimental.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  repoUrl = "git://github.com/Dieterbe/uzbl.git";
-  baseName = "uzbl-experimental";
-  method = "fetchgit";
-  rev = "origin/experimental";
-}