From f0269de17fe4fe3aeff0fb20b04e93b9c5cd4109 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 6 Feb 2019 00:27:19 +0900 Subject: [PATCH 1/5] luaPackages.lpeg_patterns: move to generated --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 20 ++++++++++++++ pkgs/top-level/lua-packages.nix | 26 ------------------- 3 files changed, 21 insertions(+), 26 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index e6817a060560..5dfd43757249 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -2,6 +2,7 @@ ansicolors, argparse, dkjson inspect +lpeg_patterns lrexlib-gnu, lrexlib-posix, ltermbox, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index dc15a7a9ad67..d1d98aefbcc3 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -90,6 +90,26 @@ inspect = buildLuarocksPackage { }; }; }; +lpeg_patterns = buildLuarocksPackage { + pname = "lpeg_patterns"; + version = "0.5-0"; + + src = fetchurl { + url = https://luarocks.org/lpeg_patterns-0.5-0.src.rock; + sha256 = "0mlw4nayrsdxrh98i26avz5i4170a9brciybw88kks496ra36v8f"; + }; + + propagatedBuildInputs = [lua lpeg ]; + buildType="builtin"; + + meta = { + homepage = "https://github.com/daurnimator/lpeg_patterns/archive/v0.5.zip"; + description="a collection of LPEG patterns"; + license = { + fullName = "MIT"; + }; + }; +}; lrexlib-gnu = buildLuarocksPackage { pname = "lrexlib-gnu"; version = "2.9.0-1"; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index de68c139dc28..ea029000bb1d 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -915,32 +915,6 @@ with self; { }; }; - lpeg_patterns = buildLuaPackage rec { - version = "0.5"; - name = "lpeg_patterns-${version}"; - - src = fetchFromGitHub { - owner = "daurnimator"; - repo = "lpeg_patterns"; - rev = "v${version}"; - sha256 = "1s3c179a64r45ffkawv9dnxw4mzwkzj00nr9z2gs5haajgpjivw6"; - }; - - buildPhase = ":"; - installPhase = '' - mkdir -p "$out/lib/lua/${lua.luaversion}" - mv lpeg_patterns "$out/lib/lua/${lua.luaversion}/" - ''; - - meta = with stdenv.lib; { - description = "A collection of LPEG patterns"; - homepage = "https://github.com/daurnimator/lpeg_patterns"; - license = licenses.mit; - maintainers = with maintainers; [ vcunat ]; - inherit (lpeg.meta) platforms; - }; - }; - cjson = buildLuaPackage rec { name = "cjson-${version}"; version = "2.1.0"; From 582fa48e6f5c7c2c095b6304786437f7e4f170fb Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 6 Feb 2019 00:31:35 +0900 Subject: [PATCH 2/5] luaPackages.fifo: move to generated --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 50 +++++++++++++------ pkgs/top-level/lua-packages.nix | 26 ---------- 3 files changed, 36 insertions(+), 41 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 5dfd43757249..a9aceb6cf07a 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -1,6 +1,7 @@ ansicolors, argparse, dkjson +fifo inspect lpeg_patterns lrexlib-gnu, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index d1d98aefbcc3..46b84403f8c6 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -70,6 +70,26 @@ dkjson = buildLuarocksPackage { }; }; }; +fifo = buildLuarocksPackage { + pname = "fifo"; + version = "0.2-0"; + + src = fetchurl { + url = https://luarocks.org/fifo-0.2-0.src.rock; + sha256 = "082c5g1m8brnsqj5gnjs65bm7z50l6b05cfwah14lqaqsr5a5pjk"; + }; + + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "https://github.com/daurnimator/fifo.lua"; + description="A lua library/'class' that implements a FIFO"; + license = { + fullName = "MIT/X11"; + }; + }; +}; inspect = buildLuarocksPackage { pname = "inspect"; version = "3.1.1-0"; @@ -98,7 +118,7 @@ lpeg_patterns = buildLuarocksPackage { url = https://luarocks.org/lpeg_patterns-0.5-0.src.rock; sha256 = "0mlw4nayrsdxrh98i26avz5i4170a9brciybw88kks496ra36v8f"; }; - + propagatedBuildInputs = [lua lpeg ]; buildType="builtin"; @@ -187,7 +207,7 @@ lua-cmsgpack = buildLuarocksPackage { "fetchSubmodules": true } '') ["date"]) ; - + disabled = ( luaOlder "5.1"); propagatedBuildInputs = [lua ]; buildType="builtin"; @@ -233,9 +253,9 @@ lua-term = buildLuarocksPackage { url = https://github.com/hoelzro/lua-term/archive/0.07.tar.gz; sha256 = "0c3zc0cl3a5pbdn056vnlan16g0wimv0p9bq52h7w507f72x18f1"; }; - - - + + + buildType="builtin"; meta = { @@ -299,8 +319,8 @@ penlight = buildLuarocksPackage { url = http://stevedonovan.github.io/files/penlight-1.5.4.zip; sha256 = "138f921p6kdqkmf4pz115phhj0jsqf28g33avws80d2vq2ixqm8q"; }; - - + + propagatedBuildInputs = [luafilesystem ]; buildType="builtin"; @@ -325,7 +345,7 @@ say = buildLuarocksPackage { url = https://github.com/Olivine-Labs/say/archive/v1.3-1.tar.gz; sha256 = "1jh76mxq9dcmv7kps2spwcc6895jmj2sf04i4y9idaxlicvwvs13"; }; - + disabled = ( luaOlder "5.1"); propagatedBuildInputs = [lua ]; buildType="builtin"; @@ -351,7 +371,7 @@ luv = buildLuarocksPackage { url = https://github.com/luvit/luv/releases/download/1.22.0-1/luv-1.22.0-1.tar.gz; sha256 = "1xvz4a0r6kd1xqxwm55g9n6imprxb79600x7dhyillrz7p5nm217"; }; - + disabled = ( luaOlder "5.1"); propagatedBuildInputs = [lua ]; buildType="cmake"; @@ -412,8 +432,8 @@ mpack = buildLuarocksPackage { url = http://luarocks.org/manifests/teto/mpack-1.0.7-0.src.rock; sha256 = "0nq4ixaminkc7fwfpivysyv0al3j5dffsvgdrnwnqdg3w7jgfbw7"; }; - - + + buildType="builtin"; meta = { @@ -457,7 +477,7 @@ busted = buildLuarocksPackage { url = https://github.com/Olivine-Labs/busted/archive/v2.0.rc13-0.tar.gz; sha256 = "0m72bldn1r6j94ahcfmpaq1mmysrshf9qi9fjas7hpal0jp8ivvl"; }; - + disabled = ( luaOlder "5.1"); propagatedBuildInputs = [lua lua_cliargs luafilesystem luasystem dkjson say luassert lua-term penlight mediator_lua ]; buildType="builtin"; @@ -483,7 +503,7 @@ luassert = buildLuarocksPackage { url = https://github.com/Olivine-Labs/luassert/archive/v1.7.11.tar.gz; sha256 = "1vwq3wqj9cjyz9lnf1n38yhpcglr2h40v3n9096i8vcpmyvdb3ka"; }; - + disabled = ( luaOlder "5.1"); propagatedBuildInputs = [lua say ]; buildType="builtin"; @@ -504,8 +524,8 @@ coxpcall = buildLuarocksPackage { url = https://luarocks.org/manifests/hisham/coxpcall-1.17.0-1.src.rock; sha256 = "0n1jmda4g7x06458596bamhzhcsly6x0p31yp6q3jz4j11zv1zhi"; }; - - + + buildType="builtin"; meta = { diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index ea029000bb1d..66a699db0f5a 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -216,32 +216,6 @@ with self; { }; }; - fifo = buildLuaPackage rec { - version = "0.2"; - name = "fifo-${version}"; - - src = fetchFromGitHub { - owner = "daurnimator"; - repo = "fifo.lua"; - rev = version; - sha256 = "1800k7h5hxsvm05bjdr65djjml678lwb0661cll78z1ys2037nzn"; - }; - - buildPhase = ":"; - installPhase = '' - mkdir -p "$out/lib/lua/${lua.luaversion}" - mv fifo.lua "$out/lib/lua/${lua.luaversion}/" - ''; - - meta = with stdenv.lib; { - description = "A lua library/'class' that implements a FIFO"; - homepage = "https://github.com/daurnimator/fifo.lua"; - license = licenses.mit; - maintainers = with maintainers; [ vcunat ]; - platforms = platforms.all; - }; - }; - luabitop = buildLuaPackage rec { version = "1.0.2"; name = "bitop-${version}"; From 84d4faf8d52111eb0fca02fd7c577034597db120 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 6 Feb 2019 00:37:09 +0900 Subject: [PATCH 3/5] luaPackages.basexx: move to generated --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 20 ++++++++++++++ pkgs/top-level/lua-packages.nix | 26 ------------------- 3 files changed, 21 insertions(+), 26 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index a9aceb6cf07a..c0e89206328a 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -1,5 +1,6 @@ ansicolors, argparse, +basexx, dkjson fifo inspect diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 46b84403f8c6..e168d9fd53c6 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -50,6 +50,26 @@ argparse = buildLuarocksPackage { }; }; }; +basexx = buildLuarocksPackage { + pname = "basexx"; + version = "0.4.0-1"; + + src = fetchurl { + url = https://luarocks.org/basexx-0.4.0-1.src.rock; + sha256 = "1px8yrxg1qkk3kzdqj3siry742jdv4ysp2dmicxi15mkynqpjlzz"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "https://github.com/aiq/basexx"; + description="A base2, base16, base32, base64 and base85 library for Lua"; + license = { + fullName = "MIT"; + }; + }; +}; dkjson = buildLuarocksPackage { pname = "dkjson"; version = "2.5-2"; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 66a699db0f5a..84918b1d8b57 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -100,32 +100,6 @@ with self; { luarocks-nix = callPackage ../development/tools/misc/luarocks/luarocks-nix.nix { }; - basexx = buildLuaPackage rec { - version = "0.4.0"; - name = "basexx-${version}"; - - src = fetchFromGitHub { - owner = "aiq"; - repo = "basexx"; - rev = "v${version}"; - sha256 = "12y0ng9bp5b98iax35pnp0kc0mb42spv1cbywvfq6amik6l0ya7g"; - }; - - buildPhase = ":"; - installPhase = '' - install -Dt "$out/lib/lua/${lua.luaversion}/" \ - lib/basexx.lua - ''; - - meta = with stdenv.lib; { - description = "Lua library for base2, base16, base32, base64, base85"; - homepage = "https://github.com/aiq/basexx"; - license = licenses.mit; - maintainers = with maintainers; [ vcunat ]; - platforms = platforms.all; - }; - }; - bit32 = buildLuaPackage rec { version = "5.3.0"; name = "bit32-${version}"; From c01fe375ca192395af8ae8c575ff8eaa79ed03d8 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 6 Feb 2019 00:54:37 +0900 Subject: [PATCH 4/5] luaPackages.cqueues: move to generated --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 20 ++++++++++++++++ pkgs/development/lua-modules/overrides.nix | 13 +++++++++++ pkgs/top-level/lua-packages.nix | 23 ------------------- 4 files changed, 34 insertions(+), 23 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index c0e89206328a..9433172f63a8 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -1,6 +1,7 @@ ansicolors, argparse, basexx, +cqueues dkjson fifo inspect diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index e168d9fd53c6..e974bf42bee7 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -70,6 +70,26 @@ basexx = buildLuarocksPackage { }; }; }; +cqueues = buildLuarocksPackage { + pname = "cqueues"; + version = "20171014.52-0"; + + src = fetchurl { + url = https://luarocks.org/cqueues-20171014.52-0.src.rock; + sha256 = "0q3iy1ja20nq2sn2n6badzhjq5kni86pfc09n5g2c46q9ja3vfzx"; + }; + disabled = ( lua.luaversion != "5.2"); + propagatedBuildInputs = [lua ]; + buildType="make"; + + meta = { + homepage = "http://25thandclement.com/~william/projects/cqueues.html"; + description="Continuation Queues: Embeddable asynchronous networking, threading, and notification framework for Lua on Unix."; + license = { + fullName = "MIT/X11"; + }; + }; +}; dkjson = buildLuarocksPackage { pname = "dkjson"; version = "2.5-2"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 20a24681b6ae..41b395d885b1 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -5,6 +5,19 @@ with super; ##########################################3 #### manual fixes for generated packages ##########################################3 + cqueues = super.cqueues.override({ + nativeBuildInputs = [ pkgs.gnum4 ]; + buildInputs = [ pkgs.openssl ]; + extraConfig = with pkgs; '' + variables={ + CRYPTO_INCDIR="${openssl.dev}/include"; + CRYPTO_LIBDIR="${openssl.out}/lib"; + OPENSSL_INCDIR="${openssl.dev}/include"; + OPENSSL_LIBDIR="${openssl.out}/lib"; + } + ''; + }); + ltermbox = super.ltermbox.override( { disabled = !isLua51 || isLuaJIT; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 84918b1d8b57..8c039cbf3a2a 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -167,29 +167,6 @@ with self; { }; }; - cqueues = buildLuaPackage rec { - name = "cqueues-${version}"; - version = "20171014"; - - src = fetchurl { - url = "https://www.25thandclement.com/~william/projects/releases/${name}.tgz"; - sha256 = "1dabhpn6r0hlln8vx9hxm34pfcm46qzgpb2apmziwg5z51fi4ksb"; - }; - - preConfigure = ''export prefix=$out''; - - nativeBuildInputs = [ gnum4 ]; - buildInputs = [ openssl ]; - - meta = with stdenv.lib; { - description = "A type of event loop for Lua"; - homepage = "https://www.25thandclement.com/~william/projects/cqueues.html"; - license = licenses.mit; - maintainers = with maintainers; [ vcunat ]; - platforms = platforms.unix; - }; - }; - luabitop = buildLuaPackage rec { version = "1.0.2"; name = "bitop-${version}"; From 71b2e1f554f0a4283aac173fd9426f7e640baf8e Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 6 Feb 2019 00:57:53 +0900 Subject: [PATCH 5/5] luaPackages.lgi: move to generated --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 20 ++++++++++ pkgs/development/lua-modules/overrides.nix | 11 ++++++ pkgs/top-level/lua-packages.nix | 37 ------------------- 4 files changed, 32 insertions(+), 37 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 9433172f63a8..1144bc723254 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -5,6 +5,7 @@ cqueues dkjson fifo inspect +lgi lpeg_patterns lrexlib-gnu, lrexlib-posix, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index e974bf42bee7..b7224aa334db 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -150,6 +150,26 @@ inspect = buildLuarocksPackage { }; }; }; +lgi = buildLuarocksPackage { + pname = "lgi"; + version = "0.9.2-1"; + + src = fetchurl { + url = https://luarocks.org/lgi-0.9.2-1.src.rock; + sha256 = "07ajc5pdavp785mdyy82n0w6d592n96g95cvq025d6i0bcm2cypa"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="make"; + + meta = { + homepage = "http://github.com/pavouk/lgi"; + description="Lua bindings to GObject libraries"; + license = { + fullName = "MIT/X11"; + }; + }; +}; lpeg_patterns = buildLuarocksPackage { pname = "lpeg_patterns"; version = "0.5-0"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 41b395d885b1..1fcc49bf5468 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -18,6 +18,17 @@ with super; ''; }); + lgi = super.lgi.overrideAttrs(oa: { + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with pkgs; oa.buildInputs ++ [ glib gobjectIntrospection]; + patches = [ + (pkgs.fetchpatch { + name = "lgi-find-cairo-through-typelib.patch"; + url = "https://github.com/psychon/lgi/commit/46a163d9925e7877faf8a4f73996a20d7cf9202a.patch"; + sha256 = "0gfvvbri9kyzhvq3bvdbj2l6mwvlz040dk4mrd5m9gz79f7w109c"; + }) + ]; + }); ltermbox = super.ltermbox.override( { disabled = !isLua51 || isLuaJIT; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 8c039cbf3a2a..7a1738b0f3ee 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -871,43 +871,6 @@ with self; { }; }; - lgi = toLuaModule(stdenv.mkDerivation rec { - name = "lgi-${version}"; - version = "0.9.2"; - - src = fetchFromGitHub { - owner = "pavouk"; - repo = "lgi"; - rev = version; - sha256 = "03rbydnj411xpjvwsyvhwy4plm96481d7jax544mvk7apd8sd5jj"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gobject-introspection lua ]; - - makeFlags = [ "LUA_VERSION=${lua.luaversion}" ]; - - preBuild = '' - sed -i "s|/usr/local|$out|" lgi/Makefile - ''; - - patches = [ - (fetchpatch { - name = "lgi-find-cairo-through-typelib.patch"; - url = "https://github.com/psychon/lgi/commit/46a163d9925e7877faf8a4f73996a20d7cf9202a.patch"; - sha256 = "0gfvvbri9kyzhvq3bvdbj2l6mwvlz040dk4mrd5m9gz79f7w109c"; - }) - ]; - - meta = with stdenv.lib; { - description = "GObject-introspection based dynamic Lua binding to GObject based libraries"; - homepage = https://github.com/pavouk/lgi; - license = licenses.mit; - maintainers = with maintainers; [ lovek323 rasendubi ]; - platforms = platforms.unix; - }; - }); - mpack = buildLuaPackage rec { name = "mpack-${version}"; version = "1.0.7";