diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2016-09-23 23:54:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-23 23:54:34 +0200 |
| commit | fef18bdedcc7a1141eb4171e2b27295fc47e683b (patch) | |
| tree | a7760d373486a443925ded5280ee8817e88a078b | |
| parent | 455772e8c6fb99d89718d2eb92e68d2027c1b254 (diff) | |
| parent | d81a6e6f9cb7d7a6c82b2ce563dbeb3c0ec0642c (diff) | |
| download | nixlib-fef18bdedcc7a1141eb4171e2b27295fc47e683b.tar nixlib-fef18bdedcc7a1141eb4171e2b27295fc47e683b.tar.gz nixlib-fef18bdedcc7a1141eb4171e2b27295fc47e683b.tar.bz2 nixlib-fef18bdedcc7a1141eb4171e2b27295fc47e683b.tar.lz nixlib-fef18bdedcc7a1141eb4171e2b27295fc47e683b.tar.xz nixlib-fef18bdedcc7a1141eb4171e2b27295fc47e683b.tar.zst nixlib-fef18bdedcc7a1141eb4171e2b27295fc47e683b.zip | |
Merge pull request #18801 from winksaville/update-vim_configurable-to-vim.8.0005
vim_configurable: 7.4.826 -> 8.0005
| -rw-r--r-- | pkgs/applications/editors/vim/configurable.nix | 10 | ||||
| -rw-r--r-- | pkgs/applications/editors/vim/python_framework.patch | 24 |
2 files changed, 2 insertions, 32 deletions
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index b7c87092e892..4ab0ca3f27c9 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -42,7 +42,7 @@ composableDerivation { } (fix: rec { name = "vim_configurable-${version}"; - version = "7.4.826"; + version = "8.0.0005"; enableParallelBuilding = true; # test this @@ -54,7 +54,7 @@ composableDerivation { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "04hp2gqbbj9h872bgj1g9xcaj5qlg9q45v6by2ch9n105dng9aj3"; + sha256 = "0ys3l3dr43vjad1f096ch1sl3x2ajsqkd03rdn6n812m7j4wipx0"; }; "vim-nox" = @@ -69,12 +69,6 @@ composableDerivation { prePatch = "cd src"; - # if darwin support is enabled, we want to make sure we're not building with - # OS-installed python framework - patches = stdenv.lib.optionals - (stdenv.isDarwin && (config.vim.darwin or true)) - [ ./python_framework.patch ]; - configureFlags = [ "--enable-gui=${args.gui}" "--with-features=${args.features}" ]; diff --git a/pkgs/applications/editors/vim/python_framework.patch b/pkgs/applications/editors/vim/python_framework.patch deleted file mode 100644 index ba4ddef889f6..000000000000 --- a/pkgs/applications/editors/vim/python_framework.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/auto/configure -+++ b/auto/configure -@@ -5895,13 +5895,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" -- if test "x${vi_cv_path_python}" != "x/usr/bin/python" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then -- vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python" -- fi -- 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 -@@ -5921,7 +5914,6 @@ - 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 - - if ${vi_cv_dll_name_python+:} false; then : - $as_echo_n "(cached) " >&6 |