Skip to content
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

Jump to bottom

[20.09] macvim: 8.2.539 -> 8.2.1719 #99117

Merged
merged 2 commits into from Sep 29, 2020
Merged

[20.09] macvim: 8.2.539 -> 8.2.1719 #99117

merged 2 commits into from Sep 29, 2020

Conversation

lilyball
Copy link
Member

Motivation for this change

backport of #99045

Without this version bump the package is broken due to a recent perl update. However it doesn't build on Hydra so it's not showing up as a Hydra failure.

ZHF: #97479

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@lilyball
macvim: Properly link against Nix ncurses
bba570a 
Since we're not using the Nix compiler, our buildInputs aren't
automatically exposed to the compiler, which means it was actually
compiling against system libncurses instead of Nix libncurses.

Also remove the `-Wno-error` from the make flags (and the unnecessary
`PREFIX` definition) in favor of using a much more targeted error
suppression at the configure flags. This works around an issue where
implicit function definitions are considered an error and the configure
script was trying to compile a file tht invoked an ncurses function
without including the relevant header.

(cherry picked from commit d3b1d59)
@lilyball
macvim: 8.2.539 -> 8.2.1719
64a976e 
(cherry picked from commit 9daf3b9)
@lilyball
Copy link
Member Author

ping @NixOS/nixos-release-managers

@jonringer
Copy link
Contributor

ofborg doesn't seem to build darwin anymore. Do you mind posting a nixpkgs-review done a darwin machine?

jonringer
jonringer approved these changes Sep 29, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

diff and commits LGTM

@lilyball
Copy link
Member Author

lilyball commented Sep 29, 2020 •
edited

I think ofborg is just really slow right now for darwin, the original PR took a while for its checks to populate too.

Anyway nix-review builds it just fine

2 packages updated:
macvim (8.2.539 → 8.2.1719) vimacs (8.2.539 → 8.2.1719)

https://github.com/NixOS/nixpkgs/pull/99117
2 packages built:
macvim vimacs

I didn't even know about vimacs 😅 I also tested the scripting language integration and it works (e.g. :perl print "hi" works correctly). And vimacs runs, though I don't know how to use emacs.

jonringer
jonringer approved these changes Sep 29, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Result of nixpkgs-review pr 99117 1

@jonringer jonringer merged commit 3ef78fb into NixOS:release-20.09 Sep 29, 2020
@lilyball lilyball deleted the macvim-20.09 branch September 29, 2020 21:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@lilyball @jonringer