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

Subset of Lua: convert some more packages #57015

Merged
merged 3 commits into from Mar 7, 2019
Merged

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented Mar 7, 2019

Motivation for this change

subset of #55747
cc @teto

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 nox --run "nox-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 added 3 commits March 7, 2019 10:17
it was previously run only for src.rock
libuuid is null outside of linux which may explain why ofborg refused it.
extraConfig = ''
variables = {
LIBUUID_INCDIR="${pkgs.lib.getDev pkgs.libuuid}/include";
LIBUUID_LIBDIR="${pkgs.lib.getLib pkgs.libuuid}/lib";
Copy link
Member Author

@Mic92 Mic92 Mar 7, 2019

Choose a reason for hiding this comment

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

luarocks seems a bit broken because it did not add LIBUUID_INCDIR correctly to CFLAGS and I had to add it to buildInputs as well.

@Mic92 Mic92 merged commit 2dc7486 into NixOS:master Mar 7, 2019
@Mic92 Mic92 deleted the lua-pkgs branch March 7, 2019 10:37
@vcunat
Copy link
Member

vcunat commented Mar 7, 2019

Any caveats expected from backporting to 19.03?

@teto
Copy link
Member

teto commented Mar 7, 2019

@vcunat the first 2 commits are painless. The last one about luuid is less important so it's up to you.

@vcunat
Copy link
Member

vcunat commented Mar 7, 2019

luuid doesn't build on 19.03, so I'd say that one can't make things worse.

vcunat pushed a commit that referenced this pull request Mar 7, 2019
(cherry picked from commit 2dc7486)
In particular, lua*Packages.luuid now builds.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants