pyrox.dev / nixpkgs
lol
fork atom

macvim: 8.2.539 -> 8.2.1719

Lily Ballard 9daf3b99 d3b1d59d

+25 -24
unified split
+3 -3
pkgs/applications/editors/vim/macvim.nix
··· 27 stdenv.mkDerivation { 28 pname = "macvim"; 29 30 - version = "8.2.539"; 31 32 src = fetchFromGitHub { 33 owner = "macvim-dev"; 34 repo = "macvim"; 35 - rev = "snapshot-163"; 36 - sha256 = "0ibc6h7zmk81dygkxd8a2rcq72zbqmr9kh64xhsm9h0p70505cdk"; 37 }; 38 39 enableParallelBuilding = true;
··· 27 stdenv.mkDerivation { 28 pname = "macvim"; 29 30 + version = "8.2.1719"; 31 32 src = fetchFromGitHub { 33 owner = "macvim-dev"; 34 repo = "macvim"; 35 + rev = "snapshot-166"; 36 + sha256 = "1p51q59l1dl5lnf1ms960lm8zfg39p8xq0pdjw6wdyypjj3r8v3v"; 37 }; 38 39 enableParallelBuilding = true;
+22 -21
pkgs/applications/editors/vim/macvim.patch
··· 1 diff --git a/src/MacVim/vimrc b/src/MacVim/vimrc 2 - index 23a06bf..dfb10fe 100644 3 --- a/src/MacVim/vimrc 4 +++ b/src/MacVim/vimrc 5 @@ -14,35 +14,5 @@ set backspace+=indent,eol,start ··· 29 -" or an installation from python.org: 30 -if exists("&pythonthreedll") && exists("&pythonthreehome") && 31 - \ !filereadable(&pythonthreedll) 32 - - if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/3.7/Python") 33 - - " MacPorts python 3.7 34 - - set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.7/Python 35 - - elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.7/Python") 36 - " https://www.python.org/downloads/mac-osx/ 37 - - set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.7/Python 38 - endif 39 -endif 40 - 41 +" Default cscopeprg to the Nix-installed path 42 +set cscopeprg=@CSCOPE@ 43 diff --git a/src/Makefile b/src/Makefile 44 - index 24c6934..d0f094e 100644 45 --- a/src/Makefile 46 +++ b/src/Makefile 47 - @@ -1407,7 +1407,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \ 48 MacVim/MacVim.m 49 MACVIMGUI_OBJ = objects/gui.o objects/gui_beval.o \ 50 objects/gui_macvim.o objects/MMBackend.o objects/MacVim.o ··· 54 MACVIMGUI_LIBS_DIR = 55 MACVIMGUI_LIBS1 = -framework Cocoa -framework Carbon 56 diff --git a/src/auto/configure b/src/auto/configure 57 - index 730d6d5..0259112 100755 58 --- a/src/auto/configure 59 +++ b/src/auto/configure 60 - @@ -5859,10 +5859,7 @@ $as_echo "not found" >&6; } 61 62 for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do 63 if test "X$path" != "X"; then ··· 69 MZSCHEME_LIBS="${path}/libmzscheme3m.a" 70 MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" 71 elif test -f "${path}/libracket3m.a"; then 72 - @@ -6247,23 +6244,6 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } 73 fi 74 75 if test "x$MACOS_X" = "xyes"; then ··· 93 PERL_LIBS=`echo "$PERL_LIBS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` 94 PERL_CFLAGS=`echo "$PERL_CFLAGS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` 95 fi 96 - @@ -6486,13 +6466,7 @@ __: 97 eof 98 eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" 99 rm -f -- "${tmp_mkf}" ··· 108 vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" 109 if test -n "${python_LINKFORSHARED}" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then 110 python_link_symbol=`echo ${python_LINKFORSHARED} | sed 's/\([^ \t][^ \t]*[ \t][ \t]*[^ \t][^ \t]*\)[ \t].*/\1/'` 111 - @@ -6507,7 +6481,6 @@ eof 112 fi 113 vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" 114 vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` ··· 116 117 fi 118 119 - @@ -6586,13 +6559,6 @@ rm -f core conftest.err conftest.$ac_objext \ 120 $as_echo "no" >&6; } 121 fi 122 ··· 130 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5 131 $as_echo_n "checking if compile and link flags for Python are sane... " >&6; } 132 cflags_save=$CFLAGS 133 - @@ -7486,11 +7452,7 @@ $as_echo "$tclver - OK" >&6; }; 134 135 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5 136 $as_echo_n "checking for location of Tcl include... " >&6; } 137 - if test "x$MACOS_X" != "xyes"; then 138 tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver" 139 - else 140 - - tclinc="/System/Library/Frameworks/Tcl.framework/Headers" 141 - fi 142 TCL_INC= 143 for try in $tclinc; do 144 if test -f "$try/tcl.h"; then 145 - @@ -7508,12 +7470,8 @@ $as_echo "<not found>" >&6; } 146 if test -z "$SKIP_TCL"; then 147 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5 148 $as_echo_n "checking for location of tclConfig.sh script... " >&6; } ··· 150 tclcnf=`echo $tclinc | sed s/include/lib/g` 151 tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`" 152 - else 153 - - tclcnf="/System/Library/Frameworks/Tcl.framework" 154 - fi 155 for try in $tclcnf; do 156 if test -f "$try/tclConfig.sh"; then 157 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 158 - @@ -7703,10 +7661,6 @@ $as_echo "$rubyhdrdir" >&6; } 159 if test -f "$rubylibdir/$librubya"; then 160 librubyarg="$librubyarg" 161 RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" ··· 167 168 if test "X$librubyarg" != "X"; then 169 diff --git a/src/vim.h b/src/vim.h 170 - index 87d1c92..8a7d5a5 100644 171 --- a/src/vim.h 172 +++ b/src/vim.h 173 - @@ -250,17 +250,6 @@ 174 # define SUN_SYSTEM 175 #endif 176
··· 1 diff --git a/src/MacVim/vimrc b/src/MacVim/vimrc 2 + index af43549..dfb10fe 100644 3 --- a/src/MacVim/vimrc 4 +++ b/src/MacVim/vimrc 5 @@ -14,35 +14,5 @@ set backspace+=indent,eol,start ··· 29 -" or an installation from python.org: 30 -if exists("&pythonthreedll") && exists("&pythonthreehome") && 31 - \ !filereadable(&pythonthreedll) 32 + - if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/3.8/Python") 33 + - " MacPorts python 3.8 34 + - set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.8/Python 35 + - elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.8/Python") 36 - " https://www.python.org/downloads/mac-osx/ 37 + - set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.8/Python 38 - endif 39 -endif 40 - 41 +" Default cscopeprg to the Nix-installed path 42 +set cscopeprg=@CSCOPE@ 43 diff --git a/src/Makefile b/src/Makefile 44 + index fd2d5e1..37a6d6a 100644 45 --- a/src/Makefile 46 +++ b/src/Makefile 47 + @@ -1397,7 +1397,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \ 48 MacVim/MacVim.m 49 MACVIMGUI_OBJ = objects/gui.o objects/gui_beval.o \ 50 objects/gui_macvim.o objects/MMBackend.o objects/MacVim.o ··· 54 MACVIMGUI_LIBS_DIR = 55 MACVIMGUI_LIBS1 = -framework Cocoa -framework Carbon 56 diff --git a/src/auto/configure b/src/auto/configure 57 + index 06257a5..68437df 100755 58 --- a/src/auto/configure 59 +++ b/src/auto/configure 60 + @@ -5872,10 +5872,7 @@ $as_echo "not found" >&6; } 61 62 for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do 63 if test "X$path" != "X"; then ··· 69 MZSCHEME_LIBS="${path}/libmzscheme3m.a" 70 MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" 71 elif test -f "${path}/libracket3m.a"; then 72 + @@ -6260,23 +6257,6 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } 73 fi 74 75 if test "x$MACOS_X" = "xyes"; then ··· 93 PERL_LIBS=`echo "$PERL_LIBS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` 94 PERL_CFLAGS=`echo "$PERL_CFLAGS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` 95 fi 96 + @@ -6499,13 +6479,7 @@ __: 97 eof 98 eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" 99 rm -f -- "${tmp_mkf}" ··· 108 vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" 109 if test -n "${python_LINKFORSHARED}" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then 110 python_link_symbol=`echo ${python_LINKFORSHARED} | sed 's/\([^ \t][^ \t]*[ \t][ \t]*[^ \t][^ \t]*\)[ \t].*/\1/'` 111 + @@ -6520,7 +6494,6 @@ eof 112 fi 113 vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" 114 vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` ··· 116 117 fi 118 119 + @@ -6599,13 +6572,6 @@ rm -f core conftest.err conftest.$ac_objext \ 120 $as_echo "no" >&6; } 121 fi 122 ··· 130 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5 131 $as_echo_n "checking if compile and link flags for Python are sane... " >&6; } 132 cflags_save=$CFLAGS 133 + @@ -7499,11 +7465,7 @@ $as_echo "$tclver - OK" >&6; }; 134 135 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5 136 $as_echo_n "checking for location of Tcl include... " >&6; } 137 - if test "x$MACOS_X" != "xyes"; then 138 tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver" 139 - else 140 + - tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /System/Library/Frameworks/Tcl.framework/Headers `xcrun --show-sdk-path`/System/Library/Frameworks/Tcl.framework/Versions/Current/Headers" 141 - fi 142 TCL_INC= 143 for try in $tclinc; do 144 if test -f "$try/tcl.h"; then 145 + @@ -7521,13 +7483,8 @@ $as_echo "<not found>" >&6; } 146 if test -z "$SKIP_TCL"; then 147 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5 148 $as_echo_n "checking for location of tclConfig.sh script... " >&6; } ··· 150 tclcnf=`echo $tclinc | sed s/include/lib/g` 151 tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`" 152 - else 153 + - tclcnf=`echo $tclinc | sed s/include/lib/g` 154 + - tclcnf="$tclcnf /System/Library/Frameworks/Tcl.framework `xcrun --show-sdk-path`/System/Library/Frameworks/Tcl.framework" 155 - fi 156 for try in $tclcnf; do 157 if test -f "$try/tclConfig.sh"; then 158 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 159 + @@ -7717,10 +7674,6 @@ $as_echo "$rubyhdrdir" >&6; } 160 if test -f "$rubylibdir/$librubya"; then 161 librubyarg="$librubyarg" 162 RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" ··· 168 169 if test "X$librubyarg" != "X"; then 170 diff --git a/src/vim.h b/src/vim.h 171 + index bbc01ee..5a93591 100644 172 --- a/src/vim.h 173 +++ b/src/vim.h 174 + @@ -244,17 +244,6 @@ 175 # define SUN_SYSTEM 176 #endif 177