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.

Sign up for GitHub

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

Lua: define packages for 5.3.x; update lpeg module #43141

Merged
merged 3 commits into from Jul 21, 2018
Merged

Lua: define packages for 5.3.x; update lpeg module #43141

merged 3 commits into from Jul 21, 2018

Conversation

phi-gamma
Copy link
Contributor

Motivation for this change

Most Lua packages are only available for legacy versions of Lua despite
the 5.3 series interpreter having been out for years now. That needs to
change.

Also the lpeg package in nixpkgs is rather archaic; the most recent version
1.0.1 was released in early 2017.

Things done
  • Define lua53Packages.
  • Compile-test already defined packages and disable those that wouldn’t build.
  • Update lpeg to 1.0.1.
  • Test some existing (non-public) Lua projects (all using lpeg).
  • 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)
  • Fits CONTRIBUTING.md.

@phi-gamma
lua-packages: define lua53Packages
cc5d281 
Set up lua packages for the v5.3.x interpreter.

Blacklist the set of lua-packages (luabitop, luaexpat, luazip,
luasqlite3) whose compilation fails against 5.3.4. The rest are at least
building.

Signed-off-by: Philipp Gesang <phg@phi-gamma.net>
@phi-gamma
lua-packages: update lpeg 0.12 -> 1.0.1
0b30f69 
Signed-off-by: Philipp Gesang <phg@phi-gamma.net>
@phi-gamma
lua5_3: update interpreter version 5.3.4 -> 5.3.5
2c21a97 
Update to the most recent version of the 5.3 series that was released
yesterday.

Signed-off-by: Philipp Gesang <phg@phi-gamma.net>
@phi-gamma
Copy link
Contributor Author

Additional commit: Update the 5.3 series interpreter to version 5.3.5 that was released just this week.

@phi-gamma phi-gamma mentioned this pull request Jul 17, 2018
Closed
9 tasks
@vcunat
Copy link
Member

vcunat commented Jul 21, 2018

@GrahamcOfBorg build lua53Packages.lpeg

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: lua53Packages.lpeg

Partial log (click to expand)

make[1]: Leaving directory '/build/lpeg-1.0.1'
installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/afwf82mzvjdwdbm4l2n15m3p6a0al2b5-lua5.3-lpeg-1.0.1
shrinking /nix/store/afwf82mzvjdwdbm4l2n15m3p6a0al2b5-lua5.3-lpeg-1.0.1/lib/lua/5.3/lpeg.so
strip is /nix/store/90vmpr41dzsx350k5argycaf693hnl1l-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/afwf82mzvjdwdbm4l2n15m3p6a0al2b5-lua5.3-lpeg-1.0.1/lib
patching script interpreter paths in /nix/store/afwf82mzvjdwdbm4l2n15m3p6a0al2b5-lua5.3-lpeg-1.0.1
checking for references to /build in /nix/store/afwf82mzvjdwdbm4l2n15m3p6a0al2b5-lua5.3-lpeg-1.0.1...
/nix/store/afwf82mzvjdwdbm4l2n15m3p6a0al2b5-lua5.3-lpeg-1.0.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: lua53Packages.lpeg

Partial log (click to expand)

make[1]: Leaving directory '/build/lpeg-1.0.1'
installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/r79lk961vwfx01dh3w21xlnr47y7vs3w-lua5.3-lpeg-1.0.1
shrinking /nix/store/r79lk961vwfx01dh3w21xlnr47y7vs3w-lua5.3-lpeg-1.0.1/lib/lua/5.3/lpeg.so
strip is /nix/store/7iyn7gn33i7xxjgmwf25k20246y6nd9d-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/r79lk961vwfx01dh3w21xlnr47y7vs3w-lua5.3-lpeg-1.0.1/lib
patching script interpreter paths in /nix/store/r79lk961vwfx01dh3w21xlnr47y7vs3w-lua5.3-lpeg-1.0.1
checking for references to /build in /nix/store/r79lk961vwfx01dh3w21xlnr47y7vs3w-lua5.3-lpeg-1.0.1...
/nix/store/r79lk961vwfx01dh3w21xlnr47y7vs3w-lua5.3-lpeg-1.0.1

vcunat
vcunat approved these changes Jul 21, 2018
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

Looks all good; I'd just wait for Borg's confirmation of Darwin build.

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: lua53Packages.lpeg

Partial log (click to expand)

clang -Wall -Wextra -pedantic -Waggregate-return -Wcast-align -Wcast-qual -Wdisabled-optimization -Wpointer-arith -Wshadow -Wsign-compare -Wundef -Wwrite-strings -Wbad-function-cast -Wdeclaration-after-statement -Wmissing-prototypes -Wnested-externs -Wstrict-prototypes  -O2 -std=c99 -I../lua/ -fPIC   -c -o lpcode.o lpcode.c
clang -Wall -Wextra -pedantic -Waggregate-return -Wcast-align -Wcast-qual -Wdisabled-optimization -Wpointer-arith -Wshadow -Wsign-compare -Wundef -Wwrite-strings -Wbad-function-cast -Wdeclaration-after-statement -Wmissing-prototypes -Wnested-externs -Wstrict-prototypes  -O2 -std=c99 -I../lua/ -fPIC   -c -o lpprint.o lpprint.c
env clang -bundle -undefined dynamic_lookup lpvm.o lpcap.o lptree.o lpcode.o lpprint.o -o lpeg.so
make[1]: Leaving directory '/private/tmp/nix-build-lua5.3-lpeg-1.0.1.drv-0/lpeg-1.0.1'
installing
post-installation fixup
strip is /nix/store/8axizw5mf6dx7wip65nbkyrmlkhmjhc5-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/ywvhsm3l4gm8jilam1xblcz1nzn11465-lua5.3-lpeg-1.0.1/lib
patching script interpreter paths in /nix/store/ywvhsm3l4gm8jilam1xblcz1nzn11465-lua5.3-lpeg-1.0.1
/nix/store/ywvhsm3l4gm8jilam1xblcz1nzn11465-lua5.3-lpeg-1.0.1

@matthewbauer matthewbauer merged commit 2c21a97 into NixOS:master Jul 21, 2018
vcunat added a commit that referenced this pull request Jul 21, 2018
@vcunat
Merge #43141: lua-5.3 and lpeg updates
bddcd35
@phi-gamma
Copy link
Contributor Author

phi-gamma commented Jul 22, 2018 via email

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

@vcunat vcunat vcunat approved these changes

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 11-100 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
@phi-gamma @vcunat @GrahamcOfBorg @matthewbauer