git.iko.soy/typeable/nixpkgs
on master help sign in
lua: add 5.4.2
commitd29ab49bb941659b86113749fa61c18269dbc966 authorArnout Engelen <arnout@bzzt.net> dateSun 27 Dec 2020, 12:16 (6 years ago) parent5485119
3 files changed+74−1
pkgs/development/interpreters/lua-5/default.nix+13 pkgs/development/interpreters/lua-5/liblua.so.patch+60 pkgs/top-level/all-packages.nix+1−1
pkgs/development/interpreters/lua-5/default.nix+13
@@ -14,6 +14,19 @@ let
1414 };
1515
1616in rec {
17+ lua5_4 = callPackage ./interpreter.nix {
18+ sourceVersion = { major = "5"; minor = "4"; patch = "2"; };
19+ hash = "0ksj5zpj74n0jkamy3di1p6l10v4gjnd2zjnb453qc6px6bhsmqi";
20+ patches = [
21+ # build lua as a shared library as well, MIT-licensed from
22+ # https://github.com/archlinux/svntogit-packages/tree/packages/lua/trunk
23+ ./liblua.so.patch
24+ ];
25+ };
26+
27+ lua5_4_compat = lua5_4.override({
28+ compat = true;
29+ });
1730
1831 lua5_3 = callPackage ./interpreter.nix {
1932 sourceVersion = { major = "5"; minor = "3"; patch = "5"; };
pkgs/development/interpreters/lua-5/liblua.so.patchnew file+60
@@ -0,0 +1,60 @@
1+diff --git a/Makefile b/Makefile
2+index 416f444..eeaff03 100644
3+--- a/Makefile
4++++ b/Makefile
5+@@ -52,7 +52,7 @@ R= $V.0
6+ all: $(PLAT)
7+
8+ $(PLATS) help test clean:
9+- @cd src && $(MAKE) $@
10++ @cd src && $(MAKE) $@ V=$(V) R=$(R)
11+
12+ install: dummy
13+ cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
14+diff --git a/src/Makefile b/src/Makefile
15+index 514593d..372a6dc 100644
16+--- a/src/Makefile
17++++ b/src/Makefile
18+@@ -33,6 +33,7 @@ CMCFLAGS= -Os
19+ PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris
20+
21+ LUA_A= liblua.a
22++LUA_SO= liblua.so
23+ CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o
24+ LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o
25+ BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
26+@@ -44,7 +45,7 @@ LUAC_T= luac
27+ LUAC_O= luac.o
28+
29+ ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
30+-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
31++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
32+ ALL_A= $(LUA_A)
33+
34+ # Targets start here.
35+@@ -60,6 +61,12 @@ $(LUA_A): $(BASE_O)
36+ $(AR) $@ $(BASE_O)
37+ $(RANLIB) $@
38+
39++$(LUA_SO): $(CORE_O) $(LIB_O)
40++ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)
41++ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
42++ ln -sf $(LUA_SO).$(R) $(LUA_SO)
43++
44++
45+ $(LUA_T): $(LUA_O) $(LUA_A)
46+ $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
47+
48+diff --git a/src/luaconf.h b/src/luaconf.h
49+index bdf927e..7e15198 100644
50+--- a/src/luaconf.h
51++++ b/src/luaconf.h
52+@@ -227,7 +227,7 @@
53+
54+ #else /* }{ */
55+
56+-#define LUA_ROOT "/usr/local/"
57++#define LUA_ROOT "/usr/"
58+ #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/"
59+ #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/"
60+
pkgs/top-level/all-packages.nix+1−1
@@ -10544,7 +10544,7 @@ in
1054410544
1054510545 ### LUA interpreters
1054610546 luaInterpreters = callPackage ./../development/interpreters/lua-5 {};
10547− inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat luajit_2_1 luajit_2_0;
10547+ inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat lua5_4 lua5_4_compat luajit_2_1 luajit_2_0;
1054810548
1054910549 lua5 = lua5_2_compat;
1055010550 lua = lua5;