git.iko.soy/typeable/nixpkgs
on master help sign in
luaPackages.cjson: move to generated
commit62d4e044e7eec51b31f44a70de46737505fb7796 authorMatthieu Coudron <mattator@gmail.com> dateWed 5 Jun 2019, 13:13 (7 years ago) parent97b23ec
3 files changed+20−31
maintainers/scripts/luarocks-packages.csv+1 pkgs/development/lua-modules/generated-packages.nix+19 pkgs/top-level/lua-packages.nix−31
maintainers/scripts/luarocks-packages.csv+1
@@ -16,6 +16,7 @@ lpty,,,,
1616lrexlib-gnu,,,,
1717lrexlib-posix,,,,
1818ltermbox,,,,
19+cjson,lua-cjson,,,
1920lua-cmsgpack,,,,
2021lua_cliargs,,,,
2122lua-iconv,,,,
pkgs/development/lua-modules/generated-packages.nix+19
@@ -352,6 +352,25 @@ ltermbox = buildLuarocksPackage {
352352 };
353353 };
354354};
355+cjson = buildLuarocksPackage {
356+ pname = "lua-cjson";
357+ version = "2.1.0.6-1";
358+
359+ src = fetchurl {
360+ url = https://luarocks.org/lua-cjson-2.1.0.6-1.src.rock;
361+ sha256 = "0dqqkn0aygc780kiq2lbydb255r8is7raf7md0gxdjcagp8afps5";
362+ };
363+ disabled = (luaOlder "5.1");
364+ propagatedBuildInputs = [ lua ];
365+
366+ meta = {
367+ homepage = "http://www.kyne.com.au/~mark/software/lua-cjson.php";
368+ description = "A fast JSON encoding/parsing module";
369+ license = {
370+ fullName = "MIT";
371+ };
372+ };
373+};
355374lua-cmsgpack = buildLuarocksPackage {
356375 pname = "lua-cmsgpack";
357376 version = "0.4.0-0";
pkgs/top-level/lua-packages.nix−31
@@ -684,37 +684,6 @@ with self; {
684684 };
685685 };
686686
687− cjson = buildLuaPackage rec {
688− name = "cjson-${version}";
689− version = "2.1.0";
690−
691− src = fetchurl {
692− url = "http://www.kyne.com.au/~mark/software/download/lua-${name}.tar.gz";
693− sha256 = "0y67yqlsivbhshg8ma535llz90r4zag9xqza5jx0q7lkap6nkg2i";
694− };
695−
696− preBuild = ''
697− sed -i "s|/usr/local|$out|" Makefile
698− '';
699−
700− makeFlags = [ "LUA_VERSION=${lua.luaversion}" ];
701−
702− postInstall = ''
703− rm -rf $out/share/lua/${lua.luaversion}/cjson/tests
704− '';
705−
706− installTargets = "install install-extra";
707−
708− disabled = isLuaJIT;
709−
710− meta = with stdenv.lib; {
711− description = "Lua C extension module for JSON support";
712− homepage = "https://www.kyne.com.au/~mark/software/lua-cjson.php";
713− license = licenses.mit;
714− maintainers = with maintainers; [ vyp ];
715− };
716− };
717−
718687 mpack = buildLuaPackage rec {
719688 name = "mpack-${version}";
720689 version = "1.0.7";