Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 97b23ec91dea
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 62d4e044e7ee
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Jun 5, 2019

  1. luaPackages.cjson: move to generated

    @teto
    teto authored and Matthieu Coudron committed Jun 5, 2019
    Copy the full SHA
    62d4e04 View commit details
Showing with 20 additions and 31 deletions.
  1. +1 −0 maintainers/scripts/luarocks-packages.csv
  2. +19 −0 pkgs/development/lua-modules/generated-packages.nix
  3. +0 −31 pkgs/top-level/lua-packages.nix
1 change: 1 addition & 0 deletions maintainers/scripts/luarocks-packages.csv
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@ lpty,,,,
lrexlib-gnu,,,,
lrexlib-posix,,,,
ltermbox,,,,
cjson,lua-cjson,,,
lua-cmsgpack,,,,
lua_cliargs,,,,
lua-iconv,,,,
19 changes: 19 additions & 0 deletions pkgs/development/lua-modules/generated-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -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";
31 changes: 0 additions & 31 deletions pkgs/top-level/lua-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -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";