public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update vim to v7.4.316

Browse Source
This commit is contained in:
Charles Strahan 2014-06-01 18:33:58 -04:00
parent 2f43cd3793
commit 0ec25c6f94
3 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/applications/editors/vim/configurable.nix
View File

@ -11,7 +11,7 @@ composableDerivation {
else stdenv ).mkDerivation; else stdenv ).mkDerivation;
} (fix: { } (fix: {
name = "vim_configurable-7.4.23"; name = "vim_configurable-7.4.316";
enableParallelBuilding = true; # test this enableParallelBuilding = true; # test this
@ -21,8 +21,8 @@ composableDerivation {
# latest release # latest release
args.fetchhg { args.fetchhg {
url = "https://vim.googlecode.com/hg/"; url = "https://vim.googlecode.com/hg/";
tag = "v7-4-131"; tag = "v7-4-316";
sha256 = "1akr0i4pykbrkqwrglm0dfn5nwpncb9pgg4h7fl6a8likbr5f3wb"; sha256 = "0scxx33p1ky0wihk04xqpd6rygp1crm0hx446zbjwbsjj6xxn7sx";
}; };
"vim-nox" = "vim-nox" =
@ -35,16 +35,13 @@ composableDerivation {
}.src; }.src;
}; };
prePatch = "cd src";
# if darwin support is enabled, we want to make sure we're not building with # if darwin support is enabled, we want to make sure we're not building with
# OS-installed python framework # OS-installed python framework
preConfigure patches = stdenv.lib.optionals
= stdenv.lib.optionalString (stdenv.isDarwin && (config.vim.darwin or true))
(stdenv.isDarwin && (config.vim.darwin or true)) '' [ ./python_framework.patch ];
# TODO: we should find a better way of doing this as, if the configure
# file changes, we need to change these line numbers
sed -i "5641,5644d" src/auto/configure
sed -i "5648d" src/auto/configure
'';
configureFlags configureFlags
= [ "--enable-gui=${args.gui}" "--with-features=${args.features}" ]; = [ "--enable-gui=${args.gui}" "--with-features=${args.features}" ];
@ -53,8 +50,6 @@ composableDerivation {
= [ ncurses pkgconfig gtk libX11 libXext libSM libXpm libXt libXaw libXau = [ ncurses pkgconfig gtk libX11 libXext libSM libXpm libXt libXaw libXau
libXmu glib libICE ]; libXmu glib libICE ];
prePatch = "cd src";
# most interpreters aren't tested yet.. (see python for example how to do it) # most interpreters aren't tested yet.. (see python for example how to do it)
flags = { flags = {
ftNix = { ftNix = {

6
pkgs/applications/editors/vim/default.nix
View File

@ -3,12 +3,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "vim-${version}"; name = "vim-${version}";
version = "7.4.131"; version = "7.4.316";
src = fetchhg { src = fetchhg {
url = "https://vim.googlecode.com/hg/"; url = "https://vim.googlecode.com/hg/";
tag = "v7-4-131"; tag = "v7-4-316";
sha256 = "1akr0i4pykbrkqwrglm0dfn5nwpncb9pgg4h7fl6a8likbr5f3wb"; sha256 = "0scxx33p1ky0wihk04xqpd6rygp1crm0hx446zbjwbsjj6xxn7sx";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

23
pkgs/applications/editors/vim/python_framework.patch Normal file
View File

@ -0,0 +1,23 @@
diff --git a/src/auto/configure b/src/auto/configure
index a9755a0..4a0e2a4 100755
--- a/auto/configure
+++ b/auto/configure
@@ -5638,10 +5638,6 @@ __:
eof
eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
rm -f -- "${tmp_mkf}"
- if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \
- "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
- vi_cv_path_python_plibs="-framework Python"
- else
if test "${vi_cv_var_python_version}" = "1.4"; then
vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
else
@@ -5649,7 +5645,6 @@ eof
fi
vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
- fi
fi