From 5d15ef0e7ce2c992630ec5338047a0b8db8508af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 4 Apr 2012 21:30:49 +0000
Subject: [PATCH] Updating vimprobable2 to 1.0.0

I took mainly the patch from Alexandr Foremny, but I had to solve conflicts.

Moreover it required the old webkit.


svn path=/nixpkgs/trunk/; revision=33596
---
 .../networking/browsers/vimprobable2/default.nix | 16 ++++++++--------
 pkgs/lib/maintainers.nix                         |  1 +
 pkgs/top-level/all-packages.nix                  |  1 +
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix
index e4494f95656..071dcd37117 100644
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix
@@ -1,13 +1,13 @@
-{stdenv, fetchurl, makeWrapper, perl, pkgconfig, webkit_gtk2, gtk, libX11, libsoup,
-glib_networking}:
+{ stdenv, fetchurl, makeWrapper, glib_networking, gtk, libsoup, libX11, perl,
+  pkgconfig, webkit }:
 
 stdenv.mkDerivation {
-  name = "vimprobable2-0.9.12.0";
+  name = "vimprobable2-1.0.0";
   src = fetchurl {
-    url = "mirror://sourceforge/vimprobable/vimprobable2_0.9.12.0.tar.bz2";
-    sha256 = "1b6xs6rd4rxy9kdsva13bbx7pd2gy159ad8ncd4pplsqr46hw8fb";
+    url = "mirror://sourceforge/vimprobable/vimprobable2_1.0.0.tar.bz2";
+    sha256 = "1jlx8ssgk42vg1d70n0aa86lr5zixdkkagmcxjc4c7pjvh8vq3gn";
   };
-  buildInputs = [ makeWrapper perl pkgconfig libX11 libsoup webkit_gtk2 gtk ];
+  buildInputs = [ makeWrapper gtk libsoup libX11 perl pkgconfig webkit ];
   installPhase = ''
     make PREFIX=/ DESTDIR=$out install
     wrapProgram "$out/bin/vimprobable2" --prefix GIO_EXTRA_MODULES : \
@@ -28,8 +28,8 @@ stdenv.mkDerivation {
       being completely featureless. 
     '';
     homepage = "http://sourceforge.net/apps/trac/vimprobable";
-    license = "MIT";
-    maintainers = ["Alexander Foremny <alexanderforemny@googlemail.com>"];
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.aforemny ];
     platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index 006429be6fa..dcfc47a456a 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -4,6 +4,7 @@
   /* Add your name and email address here.  Keep the list
      alphabetically sorted.  */
 
+  aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>";
   all = "Nix Committers <nix-commits@lists.science.uu.nl>";
   andres = "Andres Loeh <ksnixos@andres-loeh.de>";
   astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2232ff56436..e97db624e94 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8608,6 +8608,7 @@ let
 
   vimprobable2 = callPackage ../applications/networking/browsers/vimprobable2 {
     inherit (gnome) libsoup;
+    webkit = webkit_gtk2;
   };
 
   vimprobable2Wrapper = wrapFirefox