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

lua-modules/generated: regen for formatting, luv -> 1.28 #61561

Merged
merged 2 commits into from Jun 4, 2019

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented May 15, 2019

Motivation for this change

libuv is 1.28, bump luv to match, use improved formatting using current.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@teto
Copy link
Member

teto commented May 16, 2019

@GrahamcOfBorg build luaPackages.luv neovim-unwrapped

@teto
Copy link
Member

teto commented May 16, 2019

@dtzWill
Copy link
Member Author

dtzWill commented May 16, 2019

Hmm, it appears there are bundled copies of libuv that are used instead of our provided system version-- favoring a statically linked variant but AFAICT it doesn't look for a provided copy by default regardless.

I've pushed a commit that addresses this (and ensures our system copy is what is used), but not especially fond of where that ended up.

Suggestions/thoughts?

@teto
Copy link
Member

teto commented May 21, 2019

weird it didn't appear before, is that a new thing in libuv ? I skipped over this as I thought it was darwin specific but it's for linux as well. I will have a look, check that it's fine with neovim and merge

@teto teto self-assigned this May 21, 2019
@dtzWill
Copy link
Member Author

dtzWill commented May 21, 2019 via email

@teto
Copy link
Member

teto commented May 21, 2019

yeah the README mentions WITH_SHARED_LIBUV. Have you tried via cmakeFlags = [ -D WITH_SHARED_LIBUV ] ? (is there a specific error for " # This is a hacky way to specify -DWITH_SHARED_LIBUV=ON which # should be possible but I'm unable to make work." or it just doens't work xD ? )

@teto
Copy link
Member

teto commented Jun 4, 2019

@dtzWill I am doing some update on the lua infrastructure: I have fixed all (?) indentation issues in luarocks-nix and added some fixes that allow to generate packages for more luarock packages.
The only blocking item for me to upstream this is the luv update.
I wanted to know if you had tried the things in my previous posts ? otherwise I will merge this.

@dtzWill
Copy link
Member Author

dtzWill commented Jun 4, 2019

I don't know if tried cmakeFlags-- I thought I'd have to plumb it via something that put it in the lua options array/table (as others in this file do for other things).

I'll poke at this a bit more right now and report...

And hooray re:touchups on the luarocks-nix! \o/

@dtzWill
Copy link
Member Author

dtzWill commented Jun 4, 2019

Hmm can't seem to get the cmake flags through--although I admit that sure seems like an obtainable goal. I think unless you'd like to take a try then this is the best we have for now :).

@teto teto merged commit fbc670d into NixOS:master Jun 4, 2019
@teto
Copy link
Member

teto commented Jun 4, 2019

thanks for looking into it. Since I want to push some stuff behind this, let's merge it :p
Let's revisit during next luv update (wishful thinking at its best :D)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants