diff options
author | Jason \"Don\" O'Conal <lovek323@gmail.com> | 2013-09-04 11:32:06 +1000 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-09-18 21:59:49 +0200 |
commit | 2eb384b9828d7a5ab577fe46f223ff931e8c72f4 (patch) | |
tree | b627fe5caad01d9926f0f816512d600ad1b879cd /pkgs/applications/editors | |
parent | 4736e6d509a7e928241b98ccf91dd73e438f26f0 (diff) | |
download | nixlib-2eb384b9828d7a5ab577fe46f223ff931e8c72f4.tar nixlib-2eb384b9828d7a5ab577fe46f223ff931e8c72f4.tar.gz nixlib-2eb384b9828d7a5ab577fe46f223ff931e8c72f4.tar.bz2 nixlib-2eb384b9828d7a5ab577fe46f223ff931e8c72f4.tar.lz nixlib-2eb384b9828d7a5ab577fe46f223ff931e8c72f4.tar.xz nixlib-2eb384b9828d7a5ab577fe46f223ff931e8c72f4.tar.zst nixlib-2eb384b9828d7a5ab577fe46f223ff931e8c72f4.zip |
vim_configurable: add patches to 7.4.23 (close #912)
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r-- | pkgs/applications/editors/vim/configurable.nix | 33 | ||||
-rw-r--r-- | pkgs/applications/editors/vim/default.nix | 21 |
2 files changed, 42 insertions, 12 deletions
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index b3992dfec304..789ddcc10395 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -11,7 +11,7 @@ composableDerivation { else stdenv ).mkDerivation; } (fix: { - name = "vim_configurable-7.4"; + name = "vim_configurable-7.4.23"; enableParallelBuilding = true; # test this @@ -38,8 +38,10 @@ composableDerivation { preConfigure = stdenv.lib.optionalString (stdenv.isDarwin && (config.vim.darwin or true)) '' - sed -i "5387,5390d" src/auto/configure - sed -i "5394d" src/auto/configure + # 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 @@ -49,10 +51,26 @@ composableDerivation { = [ ncurses pkgconfig gtk libX11 libXext libSM libXpm libXt libXaw libXau libXmu glib libICE ]; + prePatch = "cd src"; + + patches = + [ ./patches/7.4.001 ./patches/7.4.002 ./patches/7.4.003 ./patches/7.4.004 + ./patches/7.4.005 ./patches/7.4.006 ./patches/7.4.007 ./patches/7.4.008 + ./patches/7.4.009 ./patches/7.4.010 ./patches/7.4.011 ./patches/7.4.012 + ./patches/7.4.013 ./patches/7.4.014 ./patches/7.4.015 ./patches/7.4.016 + ./patches/7.4.017 ./patches/7.4.018 ./patches/7.4.019 ./patches/7.4.020 + ./patches/7.4.021 ./patches/7.4.022 ./patches/7.4.023 ]; + # most interpreters aren't tested yet.. (see python for example how to do it) flags = { ftNix = { - patches = [ ./ft-nix-support.patch ]; + # because we cd to src in the main patch phase, we can't just add this + # patch to the list, we have to apply it manually + postPatch = '' + cd ../runtime + patch -p2 < ${./ft-nix-support.patch} + cd .. + ''; }; } // edf { name = "darwin"; } #Disable Darwin (Mac OS X) support. @@ -131,10 +149,11 @@ composableDerivation { dontStrip = 1; - meta = { + meta = with stdenv.lib; { description = "The most popular clone of the VI editor"; - homepage = "www.vim.org"; - platforms = lib.platforms.unix; + homepage = http://www.vim.org; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; }; }) diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 2a2b3dd6be4f..a2672b5c0d67 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, ncurses, gettext, pkgconfig }: stdenv.mkDerivation rec { - name = "vim-7.4"; + patchLevel = "23"; + name = "vim-7.4.${patchLevel}"; 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 = "1pjaffap91l2rb9pjnlbrpvb3ay5yhhr3g91zabjvw1rqk9adxfh"; }; @@ -39,10 +40,20 @@ stdenv.mkDerivation rec { # To fix the trouble in vim73, that it cannot cross-build with this patch # to bypass a configure script check that cannot be done cross-building. # http://groups.google.com/group/vim_dev/browse_thread/thread/66c02efd1523554b?pli=1 - patchPhase = '' - sed -i -e 's/as_fn_error.*int32.*/:/' src/auto/configure - ''; + # patchPhase = '' + # sed -i -e 's/as_fn_error.*int32.*/:/' src/auto/configure + # ''; + + prePatch = "cd src"; + patches = + [ ./patches/7.4.001 ./patches/7.4.002 ./patches/7.4.003 ./patches/7.4.004 + ./patches/7.4.005 ./patches/7.4.006 ./patches/7.4.007 ./patches/7.4.008 + ./patches/7.4.009 ./patches/7.4.010 ./patches/7.4.011 ./patches/7.4.012 + ./patches/7.4.013 ./patches/7.4.014 ./patches/7.4.015 ./patches/7.4.016 + ./patches/7.4.017 ./patches/7.4.018 ./patches/7.4.019 ./patches/7.4.020 + ./patches/7.4.021 ./patches/7.4.022 ./patches/7.4.023 ]; + meta = with stdenv.lib; { description = "The most popular clone of the VI editor"; homepage = http://www.vim.org; |