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

luajit_2_0, luajit_2_1: 2.1.0-2020-03-20 -> 2.1.0-2020-08-05 #94790

Merged
merged 2 commits into from Aug 11, 2020

Conversation

@lblasc
Copy link
Contributor

lblasc commented Aug 6, 2020

Motivation for this change

2.0 changes: https://github.com/LuaJIT/LuaJIT/compare/e613105..2211f6f
Mostly bugfixes.

2.1 changes: https://github.com/LuaJIT/LuaJIT/compare/9143e86..10ddae7
Lot of bugfixes, optimizations and modernization. For me the most interesting commits:

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.
@teto
teto approved these changes Aug 8, 2020
@teto
Copy link
Contributor

teto commented Aug 8, 2020

@GrahamcOfBorg build neovim luajitPackages.lpeg

@teto
Copy link
Contributor

teto commented Aug 8, 2020

also a partial nixpkgs-review gives

error: --- Error --- nix-daemon
builder for '/nix/store/6d9svxq7fdh008g25ly3gxhksqv6q1k3-luajit-2.1.0-2020-08-05-ltermbox-0.2-1.drv' failed with exit code 1; last 10 log lines:
    106 | static const struct luaL_reg lt_buffer_metatable[] = {
        |                              ^~~~~~~~~~~~~~~~~~~
  lua/ltermbox.c:195:30: error: array type has incomplete element type 'struct luaL_reg'
    195 | static const struct luaL_reg ltermbox[] = {
        |                              ^~~~~~~~
  lua/ltermbox.c:213:12: warning: return type defaults to 'int' [-Wimplicit-int]
    213 | LUALIB_API luaopen_ltermbox(lua_State *L) {
        |            ^~~~~~~~~~~~~~~~
  
  Error: Build error: Failed compiling object lua/ltermbox.o
note: keeping build directory '/tmp/nix-build-luajit-2.1.0-2020-08-05-luaexpat-1.3.0-1.drv-0'
error: --- Error --- nix-daemon
builder for '/nix/store/fbidsmb2sp9vsh3xlgq7q32p14warijr-luajit-2.1.0-2020-08-05-luaexpat-1.3.0-1.drv' failed with exit code 1; last 10 log lines:
  gcc -O2 -fPIC -I/nix/store/wbr4wh47z6vscz2d6a6yii9x9vnls8d4-luajit-2.1.0-2020-08-05/include/luajit-2.1 -c src/lxplib.c -o src/lxplib.o -I/nix/store/kqhd4kk5cgaj37xcswdmmfygpvww65ms-expat-2.2.8-dev/include -Isrc/
  src/lxplib.c:593:13: error: static declaration of 'luaL_setfuncs' follows non-static declaration
    593 | static void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) {
        |             ^~~~~~~~~~~~~
  In file included from src/lxplib.c:15:
  /nix/store/wbr4wh47z6vscz2d6a6yii9x9vnls8d4-luajit-2.1.0-2020-08-05/include/luajit-2.1/lauxlib.h:88:18: note: previous declaration of 'luaL_setfuncs' was here
     88 | LUALIB_API void (luaL_setfuncs) (lua_State *L, const luaL_Reg *l, int nup);
        |                  ^~~~~~~~~~~~~
  
  Error: Build error: Failed compiling object src/lxplib.o
note: keeping build directory '/tmp/nix-build-luajit-2.1.0-2020-08-05-luaffi-scm-1.drv-0'
error: --- Error --- nix-daemon
builder for '/nix/store/zsp5znkj605ib6dyr5r8qn0izbshx9pl-luajit-2.1.0-2020-08-05-luaffi-scm-1.drv' failed with exit code 1; last 10 log lines:
  ffi.h:88:13: error: static declaration of 'luaL_setfuncs' follows non-static declaration
     88 | static void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) {
        |             ^~~~~~~~~~~~~
  In file included from ffi.h:31,
                   from call.c:9:
  /nix/store/wbr4wh47z6vscz2d6a6yii9x9vnls8d4-luajit-2.1.0-2020-08-05/include/luajit-2.1/lauxlib.h:88:18: note: previous declaration of 'luaL_setfuncs' was here
     88 | LUALIB_API void (luaL_setfuncs) (lua_State *L, const luaL_Reg *l, int nup);
        |                  ^~~~~~~~~~~~~
  
  Error: Build error: Failed compiling object call.o
note: keeping build directory '/tmp/nix-build-luajit-2.1.0-2020-08-05-digestif-0.2-1.drv-0'
error: --- Error --- nix-daemon
builder for '/nix/store/44g3f848il1r8kks2vl70s2dfd8wkcs8-luajit-2.1.0-2020-08-05-digestif-0.2-1.drv' failed with exit code 1; last 10 log lines:
  patching sources
  configuring
  building
  installing
  Missing dependencies for digestif 0.2-1:
     lua >= 5.3 (5.1-1 provided by VM)
  
  digestif 0.2-1 depends on lua >= 5.3 (5.1-1 provided by VM)
@lblasc
Copy link
Contributor Author

lblasc commented Aug 9, 2020

nixpkgs-review gives:

9 packages failed to build:
gimpPlugins.focusblur gimpPlugins.texturize hawkthorne love_0_9 luajitPackages.digestif luajitPackages.ltermbox luajitPackages.luaexpat luajitPackages.luaffi obs-ndi

Most of them are marked broken (I'm not sure why nixpkgs-review is trying to build them) and some failures are not related to this update, except luajitPackages.luaexpat which was failing before this update (I've patched it and opened the pull request silverwind/luaexpat#1).

@teto
Copy link
Contributor

teto commented Aug 9, 2020

digestif should not be tried either as it requires lua >= 5.3 . weird. May look into it later. Feel free to merge.

@lblasc
Copy link
Contributor Author

lblasc commented Aug 9, 2020

@teto thx for looking into this, I don't have merge rights. pinging @vcunat

@teto
Copy link
Contributor

teto commented Aug 9, 2020

@GrahamcOfBorg build neovim luajitPackages.lpeg

@vcunat
vcunat approved these changes Aug 9, 2020
Copy link
Member

vcunat left a comment

Seems OK.

I now switched my dev-env to this 2.1.0-2020-08-05. I'd probably still wait with merging a couple more days, so other people have a chance to react.

@vcunat vcunat merged commit 48618a1 into NixOS:master Aug 11, 2020
20 of 21 checks passed
20 of 21 checks passed
tests tests
Details
tests
Details
luajitPackages.lpeg, neovim on x86_64-darwin
Details
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7c36510"; rev="7c365103d7c51a72ab03bd2526eae56efd718661"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7c36510"; rev="7c365103d7c51a72ab03bd2526eae56efd718661"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7c36510"; rev="7c365103d7c51a72ab03bd2526eae56efd718661"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7c36510"; rev="7c365103d7c51a72ab03bd2526eae56efd718661"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7c36510"; rev="7c365103d7c51a72ab03bd2526eae56efd718661"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7c36510"; rev="7c365103d7c51a72ab03bd2526eae56efd718661"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7c36510"; rev="7c365103d7c51a72ab03bd2526eae56efd718661"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
luajitPackages.lpeg, neovim on aarch64-linux Success
Details
luajitPackages.lpeg, neovim on x86_64-linux Success
Details
luajit_2_0, luajit_2_0.passthru.tests, luajit_2_1, luajit_2_1.passthru.tests on aarch64-linux Success
Details
luajit_2_0, luajit_2_0.passthru.tests, luajit_2_1, luajit_2_1.passthru.tests on x86_64-linux Success
Details
@lblasc lblasc deleted the lblasc:luajit-2020-08-05 branch Aug 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.