diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 0c52faef1bf..c7637402202 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -16,6 +16,7 @@ lpty,,,, lrexlib-gnu,,,, lrexlib-posix,,,, ltermbox,,,, +cjson,lua-cjson,,, lua-cmsgpack,,,, lua_cliargs,,,, lua-iconv,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index e7557930f11..8797aab422f 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -352,6 +352,25 @@ ltermbox = buildLuarocksPackage { }; }; }; +cjson = buildLuarocksPackage { + pname = "lua-cjson"; + version = "2.1.0.6-1"; + + src = fetchurl { + url = https://luarocks.org/lua-cjson-2.1.0.6-1.src.rock; + sha256 = "0dqqkn0aygc780kiq2lbydb255r8is7raf7md0gxdjcagp8afps5"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "http://www.kyne.com.au/~mark/software/lua-cjson.php"; + description = "A fast JSON encoding/parsing module"; + license = { + fullName = "MIT"; + }; + }; +}; lua-cmsgpack = buildLuarocksPackage { pname = "lua-cmsgpack"; version = "0.4.0-0"; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 57cd6de1b5a..7c9a4bbe583 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -684,37 +684,6 @@ with self; { }; }; - cjson = buildLuaPackage rec { - name = "cjson-${version}"; - version = "2.1.0"; - - src = fetchurl { - url = "http://www.kyne.com.au/~mark/software/download/lua-${name}.tar.gz"; - sha256 = "0y67yqlsivbhshg8ma535llz90r4zag9xqza5jx0q7lkap6nkg2i"; - }; - - preBuild = '' - sed -i "s|/usr/local|$out|" Makefile - ''; - - makeFlags = [ "LUA_VERSION=${lua.luaversion}" ]; - - postInstall = '' - rm -rf $out/share/lua/${lua.luaversion}/cjson/tests - ''; - - installTargets = "install install-extra"; - - disabled = isLuaJIT; - - meta = with stdenv.lib; { - description = "Lua C extension module for JSON support"; - homepage = "https://www.kyne.com.au/~mark/software/lua-cjson.php"; - license = licenses.mit; - maintainers = with maintainers; [ vyp ]; - }; - }; - mpack = buildLuaPackage rec { name = "mpack-${version}"; version = "1.0.7";