colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

luaPackages.readline: moved out from the generated set

Browse Source
This commit is contained in:
Matthieu Coudron 2023-10-15 01:21:01 +02:00
parent 9429b5692a
commit e8dbe285c5
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
maintainers/scripts/luarocks-packages.csv
View File

@ -100,7 +100,6 @@ penlight,https://github.com/lunarmodules/Penlight.git,,,,,alerque
plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,5.1,
rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,,
rest.nvim,,,,,5.1,teto
readline,,,,,,
say,https://github.com/Olivine-Labs/say.git,,,,,
serpent,,,,,,lockejan
sqlite,,,,,,

1 name src ref server version luaversion maintainers
100 plenary.nvim https://github.com/nvim-lua/plenary.nvim.git 5.1
101 rapidjson https://github.com/xpol/lua-rapidjson.git
102 rest.nvim 5.1 teto
readline
103 say https://github.com/Olivine-Labs/say.git
104 serpent lockejan
105 sqlite

35
pkgs/development/lua-modules/overrides.nix
View File

@ -322,7 +322,7 @@ with prev;
externalDeps = [
{ name = "EVENT"; dep = libevent; }
];
disabled = luaOlder "5.1" || luaAtLeast "5.4";
meta.broken = luaOlder "5.1" || luaAtLeast "5.4";
});
luaexpat = prev.luaexpat.overrideAttrs (_: {
@ -514,8 +514,21 @@ with prev;
'';
});
readline = prev.readline.overrideAttrs (oa: {
propagatedBuildInputs = oa.propagatedBuildInputs ++ [ readline.out ];
readline = final.callPackage({ buildLuarocksPackage, fetchurl, luaAtLeast, luaOlder, lua, luaposix }:
buildLuarocksPackage ({
pname = "readline";
version = "3.2-0";
knownRockspec = (fetchurl {
url = "mirror://luarocks/readline-3.2-0.rockspec";
sha256 = "1r0sgisxm4xd1r6i053iibxh30j7j3rcj4wwkd8rzkj8nln20z24";
}).outPath;
src = fetchurl {
# the rockspec url doesn't work because 'www.' is not covered by the certificate so
# I manually removed the 'www' prefix here
url = "http://pjb.com.au/comp/lua/readline-3.2.tar.gz";
sha256 = "1mk9algpsvyqwhnq7jlw4cgmfzj30l7n2r6ak4qxgdxgc39f48k4";
};
extraVariables = rec {
READLINE_INCDIR = "${readline.dev}/include";
HISTORY_INCDIR = READLINE_INCDIR;
@ -524,9 +537,19 @@ with prev;
unzip "$curSrc"
tar xf *.tar.gz
'';
# Without this, source root is wrongly set to ./readline-2.6/doc
sourceRoot = "readline-${lib.versions.majorMinor oa.version}";
});
disabled = (luaOlder "5.1") || (luaAtLeast "5.5");
propagatedBuildInputs = [ lua luaposix
readline.out
];
meta = {
homepage = "http://pjb.com.au/comp/lua/readline.html";
description = "Interface to the readline library";
license.fullName = "MIT/X11";
};
})) {};
sqlite = prev.sqlite.overrideAttrs (drv: {