-
-
Notifications
You must be signed in to change notification settings - Fork 14.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
macvim: 7.4.909 -> 8.1.1517 #62934
macvim: 7.4.909 -> 8.1.1517 #62934
Conversation
I tested some basic functionality, such as |
86298b2
to
559a67f
Compare
Updated to the just-released snapshot-156 which includes a fix for the recent Vim CVE (relating to modelines). |
Fix up the macvim package to build again, with the latest snapshot. The patchfile has been recreated by manually reapplying all of the changes from the old patchfile, and the other changes in here were figured out by trial and error (such as the need to unset `LD`). Also tweak the package to use python37 by default, and add an option to go back to python27 if desired. Disable Sparkle so the user isn't prompted to update a readonly package.
I've also gone ahead and added myself as a maintainer. |
This pull request has been mentioned on Nix community. There might be relevant details there: https://discourse.nixos.org/t/prs-ready-for-review-may-2019/3032/19 |
# Full path to xcodebuild | ||
substituteInPlace src/Makefile --replace "xcodebuild" "/usr/bin/xcodebuild" | ||
for nib in MainMenu Preferences; do | ||
/usr/bin/ibtool --compile src/MacVim/English.lproj/$nib.nib/keyedobjects.nib src/MacVim/English.lproj/$nib.nib |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This could cause issues when /usr/bin/ibtool doesn't exist. Probably we should follow the Hydra builds to see. I think a darwin.ibtool
might be useful to give a nice error message when this doesn't exist.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What version of macOS does Hydra run on, and what's the minimum version of macOS that Nix supports? /usr/bin/ibtool
should exist on any version of macOS from the past few years at least. I suppose this could be /usr/bin/xcrun ibtool
instead if we need to support a version of macOS that predates the introduction of the full set of build tools into /usr/bin
.
Motivation for this change
Fix up the macvim package to build again, with the latest snapshot. The patchfile has been recreated by manually reapplying all of the changes from the old patchfile, and the other changes in here were figured out by trial and error (such as the need to unset
LD
).Also tweak the package to use python37 by default, and add an option to go back to python27 if desired. I'm not actually sure what the most common python configuration is these days, so this was chosen mostly because python3 is supposed to be the future.
Disable Sparkle so the user isn't prompted to update a readonly package.
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nix-review --run "nix-review wip"
./result/bin/
)nix path-info -S
before and after)This build is impure. It relies on accessing a few tools from
/usr/bin
(includingxcodebuild
), and it sets the minimum deployment target to the current OS version. I tried patching the latter but that resulted in a bunch of warnings during the build process, so I left it alone. This impurity exists for the current broken package too, of course.CC @cstrahan