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

Luarocks update #57010

Merged
merged 3 commits into from Mar 7, 2019
Merged

Luarocks update #57010

merged 3 commits into from Mar 7, 2019

Conversation

teto
Copy link
Member

@teto teto commented Mar 7, 2019

Motivation for this change

Some lua packages have one rockspec per lua interpreter:
c01fe37#commitcomment-32572249

I've bumped luarocks that should help with nix integration (noew distinguishes test_dependencies, build_dependencies) as well as it can install rockspecs for a different lua version than its own interpreter. With the luarocks in nixpkgs, I would have to rerun the generator for every interpreter.

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 referenced this pull request Mar 7, 2019
@teto
luaPackages.cqueues: move to generated
c01fe37
teto added 3 commits March 7, 2019 17:43
@teto
luarocks: 2.4.4 -> 3.0.4
c37b892 
Some new features like test_dependencies/build_dependencies and flags ( --lua-versions)
that should make nix integration easier:
https://github.com/luarocks/luarocks/blob/master/CHANGELOG.md
@teto
luarocks-nix: bump to match luarocks
68a72f1 
Also made changes to lua package generation system to account for packages like cqueues
that have one version per lua interpreter.
The csv file also accepts comments now.
@teto
lua-packages.nix:remove unused 'overrides' setting
64801cc 
This was leftover from early implementations.
The overrides are passed via packageOverrides in lua-modules/default.nix
@7c6f434c 7c6f434c merged commit bd616c0 into NixOS:master Mar 7, 2019
@teto teto deleted the luarocks_update branch March 7, 2019 11:40
@vcunat
Copy link
Member

vcunat commented Apr 2, 2019

Would you also look at luarocks-nix for 19.03? It's in some weird state, failing to apply a patch. https://hydra.nixos.org/jobset/nixos/release-19.03/jobs-tab?filter=luarocks

@teto
Copy link
Member Author

teto commented Apr 2, 2019

I am on holiday with possibly 0 connectivity the next 2 days so woudl appreciate if someone could cherry-pick them. That should be enough ?

vcunat pushed a commit that referenced this pull request Apr 2, 2019
@7c6f434c @vcunat
Merge #57010: Luarocks update
4fff94f 
(cherry picked from commit bd616c0)
This fixes the build of luarocks-nix.

I checked that torchPackages.torch was broken even before
this batch of luarocks changes.
@vcunat
Copy link
Member

vcunat commented Apr 2, 2019

Yes, I guess it's been tested enough by being on master for almost a month. But I see it broke some torchPackages and now I ported that problem to 19.03 :-/ (I realized after pushing).

vcunat added a commit that referenced this pull request Apr 6, 2019
@vcunat
Revert "Merge #57010: Luarocks update"
dc58b3a 
This reverts commit 4fff94f.
I assumed this would fix more things than break, but apparently not.
Fixes #59057.
@vcunat
Copy link
Member

vcunat commented Apr 6, 2019

I reverted that for now due to causing issues; I suppose I'll sacrifice luarocks-nix on 19.03 and work on other nixpkgs stuff.

@teto
Copy link
Member Author

teto commented Apr 6, 2019

fine with me, might be for the best as the doc about the new infra was not merged yet.
I will try to improve the lua infrastructure week end, with converting the pkgs/applications/science/machine-learning/torch/torch-distro.nix and applying some advice from luarocks creators to split build and install phases. This should solve some problems on darwin.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

Assignees
No one assigned
Labels
10.rebuild-darwin: 101-500 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@teto @vcunat @7c6f434c @GrahamcOfBorg