Updating vim and vim_configurable to 7.4.

I change vim_configurable from 'latest' to 'default', as 'default' now is more
recent than latest.
This commit is contained in:
Lluís Batlle i Rossell 2013-08-13 17:47:27 +02:00
parent 463029fe91
commit 09e831e292
2 changed files with 8 additions and 6 deletions

View File

@ -1,6 +1,6 @@
# TODO tidy up eg The patchelf code is patching gvim even if you don't build it.. # TODO tidy up eg The patchelf code is patching gvim even if you don't build it..
# but I have gvim with python support now :) - Marc # but I have gvim with python support now :) - Marc
args@{source ? "latest", ...}: with args; args@{source ? "default", ...}: with args;
let inherit (args.composableDerivation) composableDerivation edf; in let inherit (args.composableDerivation) composableDerivation edf; in
@ -11,7 +11,7 @@ composableDerivation {
else stdenv ).mkDerivation; else stdenv ).mkDerivation;
} (fix: { } (fix: {
name = "vim_configurable-7.3"; name = "vim_configurable-7.4";
enableParallelBuilding = true; # test this enableParallelBuilding = true; # test this
@ -20,8 +20,8 @@ composableDerivation {
"default" = "default" =
# latest release # latest release
args.fetchurl { args.fetchurl {
url = ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2; url = ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2;
sha256 = "079201qk8g9yisrrb0dn52ch96z3lzw6z473dydw9fzi0xp5spaw"; sha256 = "1pjaffap91l2rb9pjnlbrpvb3ay5yhhr3g91zabjvw1rqk9adxfh";
}; };
"vim-nox" = "vim-nox" =
{ {

View File

@ -1,12 +1,14 @@
{ stdenv, fetchurl, ncurses, gettext, pkgconfig }: { stdenv, fetchurl, ncurses, gettext, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "vim-7.3"; name = "vim-7.4";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.vim.org/pub/vim/unix/${name}.tar.bz2"; url = "ftp://ftp.vim.org/pub/vim/unix/${name}.tar.bz2";
sha256 = "079201qk8g9yisrrb0dn52ch96z3lzw6z473dydw9fzi0xp5spaw"; sha256 = "1pjaffap91l2rb9pjnlbrpvb3ay5yhhr3g91zabjvw1rqk9adxfh";
}; };
enableParallelBuilding = true;
buildInputs = [ ncurses pkgconfig ]; buildInputs = [ ncurses pkgconfig ];
nativeBuildInputs = [ gettext ]; nativeBuildInputs = [ gettext ];