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

macvim: 181 -> 182

Browse Source 
Update macvim to r182. This also teaches the tag logic to be correct if
overridden for a prerelease version (e.g. 181.2).
This commit is contained in:
Lily Ballard
2025-11-02 19:11:19 -08:00
parent aee839d791
commit 7076369fd7
2 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/editors/vim/macvim.nix
+7 -8
View File
@@ -27,13 +27,17 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "macvim";
version = "181";
version = "182";
src = fetchFromGitHub {
owner = "macvim-dev";
repo = "macvim";
rev = "release-${finalAttrs.version}";
hash = "sha256-Wdq+eXSaGs+y+75ZbxoNAcyopRkWRHHRm05T0SHBrow=";
tag =
let
releaseType = if lib.hasInfix "." finalAttrs.version then "prerelease" else "release";
in
"${releaseType}-${finalAttrs.version}";
hash = "sha256-JEb71wZcvFsz94vb3+gC83BhlEccjlPrpr9RCXDUEIo=";
};
enableParallelBuilding = true;
@@ -198,10 +202,5 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with maintainers; [ lilyball ];
platforms = platforms.darwin;
hydraPlatforms = [ ]; # hydra can't build this as long as we rely on Xcode and sandboxProfile
knownVulnerabilities = [
"CVE-2025-29768"
"CVE-2025-53905"
"CVE-2025-53906"
];
};
})
pkgs/applications/editors/vim/macvim.patch
+10 -18
View File
@@ -51,10 +51,10 @@ index 162af04..4322049 100644
" vim: sw=2 ts=2 et
diff --git a/src/auto/configure b/src/auto/configure
index d4ead96..299988f 100755
index 0487236..da22ff5 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -6288,10 +6288,7 @@ printf "%s\n" "not found" >&6; }
@@ -6686,10 +6686,7 @@ printf "%s\n" "not found" >&6; }
for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do
if test "X$path" != "X"; then
@@ -66,7 +66,7 @@ index d4ead96..299988f 100755
MZSCHEME_LIBS="${path}/libmzscheme3m.a"
MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
elif test -f "${path}/libracket3m.a"; then
@@ -6720,23 +6717,6 @@ printf "%s\n" ">>> too old; need Perl version 5.003_01 or later <<<" >&6; }
@@ -7128,23 +7125,6 @@ printf "%s\n" ">>> too old; need Perl version 5.003_01 or later <<<" >&6; }
fi
if test "x$MACOS_X" = "xyes"; then
@@ -84,13 +84,13 @@ index d4ead96..299988f 100755
- if test -n "$PERL"; then
- PERL_DIR="$dir"
- PERL_CFLAGS="-DFEAT_PERL -I$darwindir/CORE"
- PERL_OBJ="objects/if_perl.o objects/if_perlsfio.o $darwindir/auto/DynaLoader/DynaLoader.a"
- PERL_OBJ="objects/if_perl.o $darwindir/auto/DynaLoader/DynaLoader.a"
- PERL_LIBS="-L$darwindir/CORE -lperl"
- fi
PERL_LIBS=`echo "$PERL_LIBS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'`
PERL_CFLAGS=`echo "$PERL_CFLAGS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'`
fi
@@ -6976,13 +6956,7 @@ __:
@@ -7393,13 +7373,7 @@ __:
eof
eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
rm -f -- "${tmp_mkf}"
@@ -101,19 +101,11 @@ index d4ead96..299988f 100755
- vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python"
- fi
- else
+
+ if true; then
vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
if test -n "${python_LINKFORSHARED}" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then
python_link_symbol=`echo ${python_LINKFORSHARED} | sed 's/\([^ \t][^ \t]*[ \t][ \t]*[^ \t][^ \t]*\)[ \t].*/\1/'`
@@ -6997,7 +6971,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
@@ -7078,13 +7051,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -7498,13 +7472,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
printf "%s\n" "no" >&6; }
fi
@@ -127,7 +119,7 @@ index d4ead96..299988f 100755
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5
printf %s "checking if compile and link flags for Python are sane... " >&6; }
cflags_save=$CFLAGS
@@ -8141,11 +8107,7 @@ printf "%s\n" "$tclver - OK" >&6; };
@@ -8593,11 +8560,7 @@ printf "%s\n" "$tclver - OK" >&6; };
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5
printf %s "checking for location of Tcl include... " >&6; }
@@ -139,7 +131,7 @@ index d4ead96..299988f 100755
TCL_INC=
for try in $tclinc; do
if test -f "$try/tcl.h"; then
@@ -8163,13 +8125,8 @@ printf "%s\n" "<not found>" >&6; }
@@ -8615,13 +8578,8 @@ printf "%s\n" "<not found>" >&6; }
if test -z "$SKIP_TCL"; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5
printf %s "checking for location of tclConfig.sh script... " >&6; }
@@ -153,7 +145,7 @@ index d4ead96..299988f 100755
for try in $tclcnf; do
if test -f "$try/tclConfig.sh"; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5
@@ -8366,10 +8323,6 @@ printf "%s\n" "$rubyhdrdir" >&6; }
@@ -8819,10 +8777,6 @@ printf "%s\n" "$rubyhdrdir" >&6; }
rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['libdir'])"`
if test -f "$rubylibdir/$librubya" || expr "$librubyarg" : "-lruby" >/dev/null; then
RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"