Author: viric
Date: Wed Apr 4 21:30:49 2012
New Revision: 33596
URL: https://nixos.org/websvn/nix/?rev=33596&sc=1
Log:
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.
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/vimprobable2/default.nix
nixpkgs/trunk/pkgs/lib/maintainers.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/vimprobable2/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/applications/networking/browsers/vimprobable2/default.nix
Wed Apr 4 21:24:09 2012 (r33595)
+++
nixpkgs/trunk/pkgs/applications/networking/browsers/vimprobable2/default.nix
Wed Apr 4 21:30:49 2012 (r33596)
@@ -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 @@
being completely featureless.
'';
homepage = "http://sourceforge.net/apps/trac/vimprobable";;
- license = "MIT";
- maintainers = ["Alexander Foremny <[email protected]>"];
+ license = stdenv.lib.licenses.mit;
+ maintainers = [ stdenv.lib.maintainers.aforemny ];
platforms = with stdenv.lib.platforms; linux;
};
}
Modified: nixpkgs/trunk/pkgs/lib/maintainers.nix
==============================================================================
--- nixpkgs/trunk/pkgs/lib/maintainers.nix Wed Apr 4 21:24:09 2012
(r33595)
+++ nixpkgs/trunk/pkgs/lib/maintainers.nix Wed Apr 4 21:30:49 2012
(r33596)
@@ -4,6 +4,7 @@
/* Add your name and email address here. Keep the list
alphabetically sorted. */
+ aforemny = "Alexander Foremny <[email protected]>";
all = "Nix Committers <[email protected]>";
andres = "Andres Loeh <[email protected]>";
astsmtl = "Alexander Tsamutali <[email protected]>";
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Apr 4 21:24:09
2012 (r33595)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Apr 4 21:30:49
2012 (r33596)
@@ -8608,6 +8608,7 @@
vimprobable2 = callPackage ../applications/networking/browsers/vimprobable2 {
inherit (gnome) libsoup;
+ webkit = webkit_gtk2;
};
vimprobable2Wrapper = wrapFirefox
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
