luaPackages.readline: move out of overrides
This commit is contained in:
committed by
Gaetan Lepage
parent
83987d8e82
commit
6fda86789f
@@ -937,53 +937,6 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
readline = final.callPackage (
|
||||
{
|
||||
buildLuarocksPackage,
|
||||
fetchurl,
|
||||
luaAtLeast,
|
||||
luaOlder,
|
||||
luaposix,
|
||||
}:
|
||||
# upstream broken, can't be generated, so moved out from the generated set
|
||||
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";
|
||||
};
|
||||
|
||||
luarocksConfig.variables = rec {
|
||||
READLINE_INCDIR = "${readline.dev}/include";
|
||||
HISTORY_INCDIR = READLINE_INCDIR;
|
||||
};
|
||||
unpackCmd = ''
|
||||
unzip "$curSrc"
|
||||
tar xf *.tar.gz
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
luaposix
|
||||
readline.out
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://pjb.com.au/comp/lua/readline.html";
|
||||
description = "Interface to the readline library";
|
||||
license.fullName = "MIT/X11";
|
||||
broken = (luaOlder "5.1") || (luaAtLeast "5.5");
|
||||
};
|
||||
}
|
||||
) { };
|
||||
|
||||
rocks-dev-nvim = prev.rocks-dev-nvim.overrideAttrs {
|
||||
|
||||
# E5113: Error while calling lua chunk [...] pl.path requires LuaFileSystem
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
{
|
||||
buildLuarocksPackage,
|
||||
fetchurl,
|
||||
luaAtLeast,
|
||||
luaOlder,
|
||||
luaposix,
|
||||
readline,
|
||||
}:
|
||||
# upstream broken, can't be generated, so moved out from the generated set
|
||||
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";
|
||||
};
|
||||
|
||||
luarocksConfig.variables = rec {
|
||||
READLINE_INCDIR = "${readline.dev}/include";
|
||||
HISTORY_INCDIR = READLINE_INCDIR;
|
||||
};
|
||||
unpackCmd = ''
|
||||
unzip "$curSrc"
|
||||
tar xf *.tar.gz
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
luaposix
|
||||
readline.out
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://pjb.com.au/comp/lua/readline.html";
|
||||
description = "Interface to the readline library";
|
||||
license.fullName = "MIT/X11";
|
||||
broken = (luaOlder "5.1") || (luaAtLeast "5.5");
|
||||
};
|
||||
}
|
||||
@@ -253,6 +253,8 @@ rec {
|
||||
inherit (pkgs) zenity;
|
||||
};
|
||||
|
||||
readline = callPackage ../development/lua-modules/readline { inherit (pkgs) readline; };
|
||||
|
||||
vicious = callPackage (
|
||||
{ fetchFromGitHub }:
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
Reference in New Issue
Block a user