From 08d7cfa4203dd5adc8b98979ab085a8a100c3f34 Mon Sep 17 00:00:00 2001
From: Wink Saville <wink@saville.com>
Date: Tue, 20 Sep 2016 16:56:31 -0700
Subject: [PATCH 1/2] Update vim_configurable to vim 8.0005

---
 pkgs/applications/editors/vim/configurable.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index b7c87092e89..59c82369d11 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" =

From d81a6e6f9cb7d7a6c82b2ce563dbeb3c0ec0642c Mon Sep 17 00:00:00 2001
From: Wink Saville <wink@saville.com>
Date: Fri, 23 Sep 2016 09:13:23 -0700
Subject: [PATCH 2/2] Remove python_framework.patch

In the [discussion](https://github.com/NixOS/nixpkgs/pull/18801) of this pull
request @LnL7 was unable to complete a darwin build because the
python_framework.patch does not apply and suggests it should be removed.
---
 .../applications/editors/vim/configurable.nix |  6 -----
 .../editors/vim/python_framework.patch        | 24 -------------------
 2 files changed, 30 deletions(-)
 delete mode 100644 pkgs/applications/editors/vim/python_framework.patch

diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index 59c82369d11..4ab0ca3f27c 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -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 ba4ddef889f..00000000000
--- 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