git.iko.soy/typeable/nixpkgs
on master help sign in
luaPackages: update

- luarocks-nix: bumped to pass args too, `package_X = callPackage ...`. It allows to remove the annoying `with self`. This new version disables tests (because broken) and now emits derivation with a callPackage in front. - replaced X.override with lib.overrideLuarocks, it should be used whenever buildInputs/extraVariables is changed since it impacts the generated luarocks config. Once structured attributes are in, it will be easier to have the luarocks config generated by a hook and we probably will be able to replace all overrideLuarocks by overrideAttrs.

commit253af9151f69d2a39f0238eab5075e7ede1454a9 authorMatthieu Coudron <mcoudron@hotmail.com> dateMon 4 Oct 2021, 00:10 (5 years ago) parentecd018b
7 files changed+626−369
maintainers/scripts/update-luarocks-packages+4−5 pkgs/development/interpreters/lua-5/build-lua-package.nix+11−10 pkgs/development/lua-modules/default.nix+1−1 pkgs/development/lua-modules/generated-packages.nix+540−293 pkgs/development/lua-modules/lib.nix+12 pkgs/development/lua-modules/overrides.nix+56−58 pkgs/development/tools/misc/luarocks/luarocks-nix.nix+2−2
maintainers/scripts/update-luarocks-packages+4−5
@@ -33,8 +33,7 @@ TMP_FILE="$(mktemp)"
3333GENERATED_NIXFILE="pkgs/development/lua-modules/generated-packages.nix"
3434LUAROCKS_CONFIG="$NIXPKGS_PATH/maintainers/scripts/luarocks-config.lua"
3535
36−HEADER = """
37−/* {GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT!
36+HEADER = """/* {GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT!
3837Regenerate it with:
3938nixpkgs$ ./maintainers/scripts/update-luarocks-packages
4039
@@ -99,9 +98,8 @@ class LuaEditor(Editor):
9998 header2 = textwrap.dedent(
10099 # header2 = inspect.cleandoc(
101100 """
102− { self, stdenv, lib, fetchurl, fetchgit, ... } @ args:
103− self: super:
104− with self;
101+ { self, stdenv, lib, fetchurl, fetchgit, callPackage, ... } @ args:
102+ final: prev:
105103 {
106104 """)
107105 f.write(header2)
@@ -199,6 +197,7 @@ def generate_pkg_nix(plug: LuaPlugin):
199197
200198 log.debug("running %s", ' '.join(cmd))
201199 output = subprocess.check_output(cmd, text=True)
200+ output = "callPackage(" + output.strip() + ") {};\n\n"
202201 return (plug, output)
203202
204203def main():
pkgs/development/interpreters/lua-5/build-lua-package.nix+11−10
@@ -25,7 +25,6 @@ pname
2525# propagate build dependencies so in case we have A -> B -> C,
2626# C can import package A propagated by B
2727, propagatedBuildInputs ? []
28−, propagatedNativeBuildInputs ? []
2928
3029# used to disable derivation, useful for specific lua versions
3130# TODO move from this setting meta.broken to a 'disabled' attribute on the
@@ -50,7 +49,7 @@ pname
5049# The latter is used to work-around luarocks having a problem with
5150# multiple-output derivations as external deps:
5251# https://github.com/luarocks/luarocks/issues/766<Paste>
53−, externalDeps ? lib.unique (lib.filter (drv: !drv ? luaModule) (propagatedBuildInputs ++ buildInputs))
52+, externalDeps ? []
5453
5554# Appended to the generated luarocks config
5655, extraConfig ? ""
@@ -74,7 +73,6 @@ pname
7473let
7574 generatedRockspecFilename = "${rockspecDir}/${pname}-${version}.rockspec";
7675
77−
7876 # TODO fix warnings "Couldn't load rockspec for ..." during manifest
7977 # construction -- from initial investigation, appears it will require
8078 # upstream luarocks changes to fix cleanly (during manifest construction,
@@ -83,7 +81,7 @@ let
8381 luarocks_config = "luarocks-config.lua";
8482 luarocks_content = let
8583 generatedConfig = lua.pkgs.lib.generateLuarocksConfig {
86− inherit externalDeps;
84+ externalDeps = externalDeps ++ externalDepsGenerated;
8785 inherit extraVariables;
8886 inherit rocksSubdir;
8987 inherit requiredLuaRocks;
@@ -99,12 +97,13 @@ let
9997 # Filter out the lua derivation itself from the Lua module dependency
10098 # closure, as it doesn't have a rock tree :)
10199 requiredLuaRocks = lib.filter (d: d ? luaModule)
102− (lua.pkgs.requiredLuaModules propagatedBuildInputs);
100+ (lua.pkgs.requiredLuaModules luarocksDrv.propagatedBuildInputs);
103101
104102 # example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ]
103+ externalDepsGenerated = lib.unique (lib.filter (drv: !drv ? luaModule) (luarocksDrv.propagatedBuildInputs ++ luarocksDrv.buildInputs));
105104 externalDeps' = lib.filter (dep: !lib.isDerivation dep) externalDeps;
106−in
107−toLuaModule ( lua.stdenv.mkDerivation (
105+
106+ luarocksDrv = toLuaModule ( lua.stdenv.mkDerivation (
108107builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariables"] // {
109108
110109 name = namePrefix + pname + "-" + version;
@@ -146,13 +145,12 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab
146145 runHook postConfigure
147146 '';
148147
149− # TODO could be moved to configurePhase
150148 buildPhase = ''
151149 runHook preBuild
152150
153151 nix_debug "Using LUAROCKS_CONFIG=$LUAROCKS_CONFIG"
154152
155− LUAROCKS=luarocks
153+ LUAROCKS=${lua.pkgs.luarocks}/bin/luarocks
156154 if (( ''${NIX_DEBUG:-0} >= 1 )); then
157155 LUAROCKS="$LUAROCKS --verbose"
158156 fi
@@ -195,6 +193,7 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab
195193 passthru = {
196194 inherit lua; # The lua interpreter
197195 inherit externalDeps;
196+ inherit luarocks_content;
198197 } // passthru;
199198
200199 meta = {
@@ -203,4 +202,6 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab
203202 maintainers = (meta.maintainers or []) ++ [ ];
204203 broken = disabled;
205204 } // meta;
206−}))
205+}));
206+in
207+ luarocksDrv
pkgs/development/lua-modules/default.nix+1−1
@@ -15,7 +15,7 @@ let
1515 overridenPackages = import ./overrides.nix { inherit pkgs; };
1616
1717 generatedPackages = if (builtins.pathExists ./generated-packages.nix) then
18− pkgs.callPackage ./generated-packages.nix { } else (final: prev: {});
18+ (final: prev: pkgs.callPackage ./generated-packages.nix { inherit (final) callPackage; } final prev) else (final: prev: {});
1919
2020 extensible-self = lib.makeExtensible
2121 (extends overrides
pkgs/development/lua-modules/generated-packages.nix+540−293
@@ -1,4 +1,3 @@
1−
21/* pkgs/development/lua-modules/generated-packages.nix is an auto-generated file -- DO NOT EDIT!
32Regenerate it with:
43nixpkgs$ ./maintainers/scripts/update-luarocks-packages
@@ -6,11 +5,13 @@ nixpkgs$ ./maintainers/scripts/update-luarocks-packages
65You can customize the generated packages in pkgs/development/lua-modules/overrides.nix
76*/
87
9−{ self, stdenv, lib, fetchurl, fetchgit, ... } @ args:
10−self: super:
11−with self;
8+{ self, stdenv, lib, fetchurl, fetchgit, callPackage, ... } @ args:
9+final: prev:
1210{
13−alt-getopt = buildLuarocksPackage {
11+alt-getopt = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
12+, fetchgit, lua
13+}:
14+buildLuarocksPackage {
1415 pname = "alt-getopt";
1516 version = "0.8.0-1";
1617 knownRockspec = (fetchurl {
@@ -30,7 +31,7 @@ alt-getopt = buildLuarocksPackage {
3031}
3132 '') ["date" "path"]) ;
3233
33− disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
34+ disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4");
3435 propagatedBuildInputs = [ lua ];
3536
3637 meta = {
@@ -39,9 +40,12 @@ alt-getopt = buildLuarocksPackage {
3940 maintainers = with lib.maintainers; [ arobyn ];
4041 license.fullName = "MIT/X11";
4142 };
42−};
43+}) {};
4344
44−argparse = buildLuarocksPackage {
45+argparse = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
46+, fetchgit, lua
47+}:
48+buildLuarocksPackage {
4549 pname = "argparse";
4650 version = "scm-2";
4751
@@ -58,7 +62,7 @@ argparse = buildLuarocksPackage {
5862}
5963 '') ["date" "path"]) ;
6064
61− disabled = (luaOlder "5.1") || (luaAtLeast "5.5");
65+ disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5");
6266 propagatedBuildInputs = [ lua ];
6367
6468 meta = {
@@ -66,9 +70,12 @@ argparse = buildLuarocksPackage {
6670 description = "A feature-rich command-line argument parser";
6771 license.fullName = "MIT";
6872 };
69−};
73+}) {};
7074
71−basexx = buildLuarocksPackage {
75+basexx = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
76+, fetchurl, lua
77+}:
78+buildLuarocksPackage {
7279 pname = "basexx";
7380 version = "scm-0";
7481 rockspecDir = "dist";
@@ -78,7 +85,7 @@ basexx = buildLuarocksPackage {
7885 sha256 = "1x0d24aaj4zld4ifr7mi8zwrym5shsfphmwx5jzw2zg22r6xzlz1";
7986 };
8087
81− disabled = (luaOlder "5.1");
88+ disabled = with lua; (luaOlder "5.1");
8289 propagatedBuildInputs = [ lua ];
8390
8491 meta = {
@@ -86,9 +93,12 @@ basexx = buildLuarocksPackage {
8693 description = "A base2, base16, base32, base64 and base85 library for Lua";
8794 license.fullName = "MIT";
8895 };
89−};
96+}) {};
9097
91−binaryheap = buildLuarocksPackage {
98+binaryheap = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
99+, fetchurl, lua
100+}:
101+buildLuarocksPackage {
92102 pname = "binaryheap";
93103 version = "0.4-1";
94104
@@ -97,7 +107,7 @@ binaryheap = buildLuarocksPackage {
97107 sha256 = "0f5l4nb5s7dycbkgh3rrl7pf0npcf9k6m2gr2bsn09fjyb3bdc8h";
98108 };
99109
100− disabled = (luaOlder "5.1");
110+ disabled = with lua; (luaOlder "5.1");
101111 propagatedBuildInputs = [ lua ];
102112
103113 meta = {
@@ -106,9 +116,12 @@ binaryheap = buildLuarocksPackage {
106116 maintainers = with lib.maintainers; [ vcunat ];
107117 license.fullName = "MIT/X11";
108118 };
109−};
119+}) {};
110120
111−bit32 = buildLuarocksPackage {
121+bit32 = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
122+, fetchgit, lua
123+}:
124+buildLuarocksPackage {
112125 pname = "bit32";
113126 version = "5.3.0-1";
114127 knownRockspec = (fetchurl {
@@ -128,7 +141,7 @@ bit32 = buildLuarocksPackage {
128141}
129142 '') ["date" "path"]) ;
130143
131− disabled = (luaOlder "5.1");
144+ disabled = with lua; (luaOlder "5.1");
132145 propagatedBuildInputs = [ lua ];
133146
134147 meta = {
@@ -137,9 +150,12 @@ bit32 = buildLuarocksPackage {
137150 maintainers = with lib.maintainers; [ lblasc ];
138151 license.fullName = "MIT/X11";
139152 };
140−};
153+}) {};
141154
142−busted = buildLuarocksPackage {
155+busted = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
156+, fetchurl, lua, lua_cliargs, luafilesystem, luasystem, dkjson, say, luassert, lua-term, penlight, mediator_lua
157+}:
158+buildLuarocksPackage {
143159 pname = "busted";
144160 version = "2.0.0-1";
145161 knownRockspec = (fetchurl {
@@ -151,7 +167,7 @@ busted = buildLuarocksPackage {
151167 sha256 = "1ps7b3f4diawfj637mibznaw4x08gn567pyni0m2s50hrnw4v8zx";
152168 };
153169
154− disabled = (luaOlder "5.1");
170+ disabled = with lua; (luaOlder "5.1");
155171 propagatedBuildInputs = [ lua lua_cliargs luafilesystem luasystem dkjson say luassert lua-term penlight mediator_lua ];
156172
157173 meta = {
@@ -159,13 +175,16 @@ busted = buildLuarocksPackage {
159175 description = "Elegant Lua unit testing.";
160176 license.fullName = "MIT <http://opensource.org/licenses/MIT>";
161177 };
162−};
178+}) {};
163179
164−cassowary = buildLuarocksPackage {
180+cassowary = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
181+, fetchgit, lua, penlight
182+}:
183+buildLuarocksPackage {
165184 pname = "cassowary";
166185 version = "2.3.1-2";
167186 knownRockspec = (fetchurl {
168− url = "https://luarocks.org/cassowary-2.3.1-2.rockspec";
187+ url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/cassowary-2.3.1-2.rockspec";
169188 sha256 = "04y882f9ai1jhk0zwla2g0fvl56a75rwnxhsl9r3m0qa5i0ia1i5";
170189 }).outPath;
171190 src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@@ -181,7 +200,7 @@ cassowary = buildLuarocksPackage {
181200}
182201 '') ["date" "path"]) ;
183202
184− disabled = (luaOlder "5.1");
203+ disabled = with lua; (luaOlder "5.1");
185204 propagatedBuildInputs = [ lua penlight ];
186205
187206 meta = {
@@ -190,9 +209,12 @@ cassowary = buildLuarocksPackage {
190209 maintainers = with lib.maintainers; [ marsam alerque ];
191210 license.fullName = "Apache 2";
192211 };
193−};
212+}) {};
194213
195−compat53 = buildLuarocksPackage {
214+compat53 = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
215+, fetchurl, lua
216+}:
217+buildLuarocksPackage {
196218 pname = "compat53";
197219 version = "0.7-1";
198220 knownRockspec = (fetchurl {
@@ -204,7 +226,7 @@ compat53 = buildLuarocksPackage {
204226 sha256 = "1x3wv1qx7b2zlf3fh4q9pmi2xxkcdm024g7bf11rpv0yacnhran3";
205227 };
206228
207− disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
229+ disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4");
208230 propagatedBuildInputs = [ lua ];
209231
210232 meta = {
@@ -213,9 +235,12 @@ compat53 = buildLuarocksPackage {
213235 maintainers = with lib.maintainers; [ vcunat ];
214236 license.fullName = "MIT";
215237 };
216−};
238+}) {};
217239
218−cosmo = buildLuarocksPackage {
240+cosmo = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
241+, fetchgit, lpeg
242+}:
243+buildLuarocksPackage {
219244 pname = "cosmo";
220245 version = "16.06.04-1";
221246 knownRockspec = (fetchurl {
@@ -243,9 +268,11 @@ cosmo = buildLuarocksPackage {
243268 maintainers = with lib.maintainers; [ marsam ];
244269 license.fullName = "MIT/X11";
245270 };
246−};
271+}) {};
247272
248−coxpcall = buildLuarocksPackage {
273+coxpcall = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
274+, fetchgit}:
275+buildLuarocksPackage {
249276 pname = "coxpcall";
250277 version = "1.17.0-1";
251278 knownRockspec = (fetchurl {
@@ -271,9 +298,12 @@ coxpcall = buildLuarocksPackage {
271298 description = "Coroutine safe xpcall and pcall";
272299 license.fullName = "MIT/X11";
273300 };
274−};
301+}) {};
275302
276−cqueues = buildLuarocksPackage {
303+cqueues = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
304+, fetchurl, lua
305+}:
306+buildLuarocksPackage {
277307 pname = "cqueues";
278308 version = "20200726.52-0";
279309 knownRockspec = (fetchurl {
@@ -285,7 +315,7 @@ cqueues = buildLuarocksPackage {
285315 sha256 = "0lhd02ag3r1sxr2hx847rdjkddm04l1vf5234v5cz9bd4kfjw4cy";
286316 };
287317
288− disabled = (lua.luaversion != "5.2");
318+ disabled = with lua; (luaversion != "5.2");
289319 propagatedBuildInputs = [ lua ];
290320
291321 meta = {
@@ -294,9 +324,12 @@ cqueues = buildLuarocksPackage {
294324 maintainers = with lib.maintainers; [ vcunat ];
295325 license.fullName = "MIT/X11";
296326 };
297−};
327+}) {};
298328
299−cyrussasl = buildLuarocksPackage {
329+cyrussasl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
330+, fetchgit, lua
331+}:
332+buildLuarocksPackage {
300333 pname = "cyrussasl";
301334 version = "1.1.0-1";
302335
@@ -313,7 +346,7 @@ cyrussasl = buildLuarocksPackage {
313346}
314347 '') ["date" "path"]) ;
315348
316− disabled = (luaOlder "5.1");
349+ disabled = with lua; (luaOlder "5.1");
317350 propagatedBuildInputs = [ lua ];
318351
319352 meta = {
@@ -321,18 +354,21 @@ cyrussasl = buildLuarocksPackage {
321354 description = "Cyrus SASL library for Lua 5.1+";
322355 license.fullName = "BSD";
323356 };
324−};
357+}) {};
325358
326−digestif = buildLuarocksPackage {
359+digestif = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
360+, fetchgit, lua, lpeg
361+}:
362+buildLuarocksPackage {
327363 pname = "digestif";
328364 version = "dev-1";
329365
330366 src = fetchgit ( removeAttrs (builtins.fromJSON ''{
331367 "url": "https://github.com/astoff/digestif",
332− "rev": "9f8f299cf7094d72edbd32a455869751246028b7",
333− "date": "2021-09-25T14:32:42+02:00",
334− "path": "/nix/store/ln1zx9cw2b7q4x5vzd6hv5nd01c1gsy3-digestif",
335− "sha256": "1cf14m03jvfs1mwaywfgv759jh0ha3pxrnyj7jxjxlsj6cim89v0",
368+ "rev": "505ca88a54012be5534654238baaa457f8446fed",
369+ "date": "2021-10-06T21:27:45+02:00",
370+ "path": "/nix/store/6wvpy0nsr5yf78by3dg8m2m0h0kf9xk4-digestif",
371+ "sha256": "1prv5nqskvilyyx3z9b2jiz72lwpz2xcas57qjpbv6qq5l2si1xm",
336372 "fetchLFS": false,
337373 "fetchSubmodules": true,
338374 "deepClone": false,
@@ -340,7 +376,7 @@ digestif = buildLuarocksPackage {
340376}
341377 '') ["date" "path"]) ;
342378
343− disabled = (luaOlder "5.3");
379+ disabled = with lua; (luaOlder "5.3");
344380 propagatedBuildInputs = [ lua lpeg ];
345381
346382 meta = {
@@ -348,13 +384,16 @@ digestif = buildLuarocksPackage {
348384 description = "A code analyzer for TeX";
349385 license.fullName = "MIT";
350386 };
351−};
387+}) {};
352388
353−dkjson = buildLuarocksPackage {
389+dkjson = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
390+, fetchurl, lua
391+}:
392+buildLuarocksPackage {
354393 pname = "dkjson";
355394 version = "2.5-3";
356395 knownRockspec = (fetchurl {
357− url = "https://luarocks.org/dkjson-2.5-3.rockspec";
396+ url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/dkjson-2.5-3.rockspec";
358397 sha256 = "18xngdzl2q207cil64aj81qi6qvj1g269pf07j5x4pbvamd6a1l3";
359398 }).outPath;
360399 src = fetchurl {
@@ -362,7 +401,7 @@ dkjson = buildLuarocksPackage {
362401 sha256 = "14wanday1l7wj2lnpabbxw8rcsa0zbvcdi1w88rdr5gbsq3xwasm";
363402 };
364403
365− disabled = (luaOlder "5.1") || (luaAtLeast "5.5");
404+ disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5");
366405 propagatedBuildInputs = [ lua ];
367406
368407 meta = {
@@ -370,13 +409,16 @@ dkjson = buildLuarocksPackage {
370409 description = "David Kolf's JSON module for Lua";
371410 license.fullName = "MIT/X11";
372411 };
373−};
412+}) {};
374413
375−fifo = buildLuarocksPackage {
414+fifo = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
415+, fetchurl, lua
416+}:
417+buildLuarocksPackage {
376418 pname = "fifo";
377419 version = "0.2-0";
378420 knownRockspec = (fetchurl {
379− url = "https://luarocks.org/fifo-0.2-0.rockspec";
421+ url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/fifo-0.2-0.rockspec";
380422 sha256 = "0vr9apmai2cyra2n573nr3dyk929gzcs4nm1096jdxcixmvh2ymq";
381423 }).outPath;
382424 src = fetchurl {
@@ -391,18 +433,21 @@ fifo = buildLuarocksPackage {
391433 description = "A lua library/'class' that implements a FIFO";
392434 license.fullName = "MIT/X11";
393435 };
394−};
436+}) {};
395437
396−gitsigns-nvim = buildLuarocksPackage {
438+gitsigns-nvim = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
439+, fetchgit, lua, plenary-nvim
440+}:
441+buildLuarocksPackage {
397442 pname = "gitsigns.nvim";
398443 version = "scm-1";
399444
400445 src = fetchgit ( removeAttrs (builtins.fromJSON ''{
401446 "url": "https://github.com/lewis6991/gitsigns.nvim",
402− "rev": "7e5c1a831f555dc398dd1564489e2b8a5c867754",
403− "date": "2021-09-25T16:49:34+01:00",
404− "path": "/nix/store/a1h8xxb9w4kvvmq7q30m1ny2pq3zbmin-gitsigns.nvim",
405− "sha256": "02kssw0lpprf9k3il6gfd00gj9fbjbksipa4f6xqkgfdq5c9l9fr",
447+ "rev": "552f114caeaec4ce97822cb55dfa7c7e5368136b",
448+ "date": "2021-10-15T13:31:44+01:00",
449+ "path": "/nix/store/40vkv3sc4h6gh9ac88k7pilszxmy38yv-gitsigns.nvim",
450+ "sha256": "0qdafm3arjf8bcqpvv085dwzbikad3sr3xzvrn3gfa0dsls8pg6q",
406451 "fetchLFS": false,
407452 "fetchSubmodules": true,
408453 "deepClone": false,
@@ -410,7 +455,7 @@ gitsigns-nvim = buildLuarocksPackage {
410455}
411456 '') ["date" "path"]) ;
412457
413− disabled = (lua.luaversion != "5.1");
458+ disabled = with lua; (luaversion != "5.1");
414459 propagatedBuildInputs = [ lua plenary-nvim ];
415460
416461 meta = {
@@ -418,9 +463,12 @@ gitsigns-nvim = buildLuarocksPackage {
418463 description = "Git signs written in pure lua";
419464 license.fullName = "MIT/X11";
420465 };
421−};
466+}) {};
422467
423−http = buildLuarocksPackage {
468+http = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
469+, fetchurl, lua, compat53, bit32, cqueues, luaossl, basexx, lpeg, lpeg_patterns, binaryheap, fifo
470+}:
471+buildLuarocksPackage {
424472 pname = "http";
425473 version = "0.3-0";
426474 knownRockspec = (fetchurl {
@@ -432,7 +480,7 @@ http = buildLuarocksPackage {
432480 sha256 = "13xyj8qx42mzn1z4lwwdfd7ha06a720q4b7d04ir6vvp2fwp3s4q";
433481 };
434482
435− disabled = (luaOlder "5.1");
483+ disabled = with lua; (luaOlder "5.1");
436484 propagatedBuildInputs = [ lua compat53 bit32 cqueues luaossl basexx lpeg lpeg_patterns binaryheap fifo ];
437485
438486 meta = {
@@ -441,9 +489,12 @@ http = buildLuarocksPackage {
441489 maintainers = with lib.maintainers; [ vcunat ];
442490 license.fullName = "MIT";
443491 };
444−};
492+}) {};
445493
446−inspect = buildLuarocksPackage {
494+inspect = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
495+, fetchurl, lua
496+}:
497+buildLuarocksPackage {
447498 pname = "inspect";
448499 version = "3.1.1-0";
449500 knownRockspec = (fetchurl {
@@ -455,7 +506,7 @@ inspect = buildLuarocksPackage {
455506 sha256 = "1nz0yqhkd0nkymghrj99gb2id40g50drh4a96g3v5k7h1sbg94h2";
456507 };
457508
458− disabled = (luaOlder "5.1");
509+ disabled = with lua; (luaOlder "5.1");
459510 propagatedBuildInputs = [ lua ];
460511
461512 meta = {
@@ -463,9 +514,12 @@ inspect = buildLuarocksPackage {
463514 description = "Lua table visualizer, ideal for debugging";
464515 license.fullName = "MIT <http://opensource.org/licenses/MIT>";
465516 };
466−};
517+}) {};
467518
468−ldbus = buildLuarocksPackage {
519+ldbus = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
520+, fetchgit, lua
521+}:
522+buildLuarocksPackage {
469523 pname = "ldbus";
470524 version = "scm-0";
471525 knownRockspec = (fetchurl {
@@ -485,7 +539,7 @@ ldbus = buildLuarocksPackage {
485539}
486540 '') ["date" "path"]) ;
487541
488− disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
542+ disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4");
489543 propagatedBuildInputs = [ lua ];
490544
491545 meta = {
@@ -493,9 +547,12 @@ ldbus = buildLuarocksPackage {
493547 description = "A Lua library to access dbus.";
494548 license.fullName = "MIT/X11";
495549 };
496−};
550+}) {};
497551
498−ldoc = buildLuarocksPackage {
552+ldoc = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
553+, fetchgit, penlight, markdown
554+}:
555+buildLuarocksPackage {
499556 pname = "ldoc";
500557 version = "scm-3";
501558
@@ -519,9 +576,12 @@ ldoc = buildLuarocksPackage {
519576 description = "A Lua Documentation Tool";
520577 license.fullName = "MIT/X11";
521578 };
522−};
579+}) {};
523580
524−lgi = buildLuarocksPackage {
581+lgi = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
582+, fetchgit, lua
583+}:
584+buildLuarocksPackage {
525585 pname = "lgi";
526586 version = "0.9.2-1";
527587 knownRockspec = (fetchurl {
@@ -541,7 +601,7 @@ lgi = buildLuarocksPackage {
541601}
542602 '') ["date" "path"]) ;
543603
544− disabled = (luaOlder "5.1");
604+ disabled = with lua; (luaOlder "5.1");
545605 propagatedBuildInputs = [ lua ];
546606
547607 meta = {
@@ -549,9 +609,12 @@ lgi = buildLuarocksPackage {
549609 description = "Lua bindings to GObject libraries";
550610 license.fullName = "MIT/X11";
551611 };
552−};
612+}) {};
553613
554−linenoise = buildLuarocksPackage {
614+linenoise = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
615+, fetchurl, lua
616+}:
617+buildLuarocksPackage {
555618 pname = "linenoise";
556619 version = "0.9-1";
557620
@@ -560,7 +623,7 @@ linenoise = buildLuarocksPackage {
560623 sha256 = "177h6gbq89arwiwxah9943i8hl5gvd9wivnd1nhmdl7d8x0dn76c";
561624 };
562625
563− disabled = (luaOlder "5.1");
626+ disabled = with lua; (luaOlder "5.1");
564627 propagatedBuildInputs = [ lua ];
565628
566629 meta = {
@@ -568,9 +631,12 @@ linenoise = buildLuarocksPackage {
568631 description = "A binding for the linenoise command line library";
569632 license.fullName = "MIT/X11";
570633 };
571−};
634+}) {};
572635
573−ljsyscall = buildLuarocksPackage {
636+ljsyscall = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
637+, fetchurl, lua
638+}:
639+buildLuarocksPackage {
574640 pname = "ljsyscall";
575641 version = "0.12-1";
576642 knownRockspec = (fetchurl {
@@ -582,7 +648,7 @@ ljsyscall = buildLuarocksPackage {
582648 sha256 = "1w9g36nhxv92cypjia7igg1xpfrn3dbs3hfy6gnnz5mx14v50abf";
583649 };
584650
585− disabled = (lua.luaversion != "5.1");
651+ disabled = with lua; (luaversion != "5.1");
586652 propagatedBuildInputs = [ lua ];
587653
588654 meta = {
@@ -591,13 +657,16 @@ ljsyscall = buildLuarocksPackage {
591657 maintainers = with lib.maintainers; [ lblasc ];
592658 license.fullName = "MIT";
593659 };
594−};
660+}) {};
595661
596−lpeg = buildLuarocksPackage {
662+lpeg = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
663+, fetchurl, lua
664+}:
665+buildLuarocksPackage {
597666 pname = "lpeg";
598667 version = "1.0.2-1";
599668 knownRockspec = (fetchurl {
600− url = "https://luarocks.org/lpeg-1.0.2-1.rockspec";
669+ url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpeg-1.0.2-1.rockspec";
601670 sha256 = "08a8p5cwlwpjawk8sczb7bq2whdsng4mmhphahyklf1bkvl2li89";
602671 }).outPath;
603672 src = fetchurl {
@@ -605,7 +674,7 @@ lpeg = buildLuarocksPackage {
605674 sha256 = "1zjzl7acvcdavmcg5l7wi12jd4rh95q9pl5aiww7hv0v0mv6bmj8";
606675 };
607676
608− disabled = (luaOlder "5.1");
677+ disabled = with lua; (luaOlder "5.1");
609678 propagatedBuildInputs = [ lua ];
610679
611680 meta = {
@@ -614,9 +683,12 @@ lpeg = buildLuarocksPackage {
614683 maintainers = with lib.maintainers; [ vyp ];
615684 license.fullName = "MIT/X11";
616685 };
617−};
686+}) {};
618687
619−lpeg_patterns = buildLuarocksPackage {
688+lpeg_patterns = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
689+, fetchurl, lua, lpeg
690+}:
691+buildLuarocksPackage {
620692 pname = "lpeg_patterns";
621693 version = "0.5-0";
622694 knownRockspec = (fetchurl {
@@ -635,9 +707,12 @@ lpeg_patterns = buildLuarocksPackage {
635707 description = "a collection of LPEG patterns";
636708 license.fullName = "MIT";
637709 };
638−};
710+}) {};
639711
640−lpeglabel = buildLuarocksPackage {
712+lpeglabel = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
713+, fetchurl, lua
714+}:
715+buildLuarocksPackage {
641716 pname = "lpeglabel";
642717 version = "1.6.0-1";
643718 knownRockspec = (fetchurl {
@@ -649,7 +724,7 @@ lpeglabel = buildLuarocksPackage {
649724 sha256 = "1i02lsxj20iygqm8fy6dih1gh21lqk5qj1mv14wlrkaywnv35wcv";
650725 };
651726
652− disabled = (luaOlder "5.1");
727+ disabled = with lua; (luaOlder "5.1");
653728 propagatedBuildInputs = [ lua ];
654729
655730 meta = {
@@ -657,13 +732,16 @@ lpeglabel = buildLuarocksPackage {
657732 description = "Parsing Expression Grammars For Lua with Labeled Failures";
658733 license.fullName = "MIT/X11";
659734 };
660−};
735+}) {};
661736
662−lpty = buildLuarocksPackage {
737+lpty = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
738+, fetchurl, lua
739+}:
740+buildLuarocksPackage {
663741 pname = "lpty";
664742 version = "1.2.2-1";
665743 knownRockspec = (fetchurl {
666− url = "https://luafr.org/luarocks/lpty-1.2.2-1.rockspec";
744+ url = "https://luarocks.org/lpty-1.2.2-1.rockspec";
667745 sha256 = "04af4mhiqrw3br4qzz7yznw9zy2m50wddwzgvzkvhd99ng71fkzg";
668746 }).outPath;
669747 src = fetchurl {
@@ -671,7 +749,7 @@ lpty = buildLuarocksPackage {
671749 sha256 = "071mvz79wi9vr6hvrnb1rv19lqp1bh2fi742zkpv2sm1r9gy5rav";
672750 };
673751
674− disabled = (luaOlder "5.1");
752+ disabled = with lua; (luaOlder "5.1");
675753 propagatedBuildInputs = [ lua ];
676754
677755 meta = {
@@ -679,9 +757,12 @@ lpty = buildLuarocksPackage {
679757 description = "A simple facility for lua to control other programs via PTYs.";
680758 license.fullName = "MIT";
681759 };
682−};
760+}) {};
683761
684−lrexlib-gnu = buildLuarocksPackage {
762+lrexlib-gnu = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
763+, fetchgit, lua
764+}:
765+buildLuarocksPackage {
685766 pname = "lrexlib-gnu";
686767 version = "2.9.1-1";
687768 knownRockspec = (fetchurl {
@@ -701,7 +782,7 @@ lrexlib-gnu = buildLuarocksPackage {
701782}
702783 '') ["date" "path"]) ;
703784
704− disabled = (luaOlder "5.1");
785+ disabled = with lua; (luaOlder "5.1");
705786 propagatedBuildInputs = [ lua ];
706787
707788 meta = {
@@ -709,9 +790,12 @@ lrexlib-gnu = buildLuarocksPackage {
709790 description = "Regular expression library binding (GNU flavour).";
710791 license.fullName = "MIT/X11";
711792 };
712−};
793+}) {};
713794
714−lrexlib-pcre = buildLuarocksPackage {
795+lrexlib-pcre = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
796+, fetchgit, lua
797+}:
798+buildLuarocksPackage {
715799 pname = "lrexlib-pcre";
716800 version = "2.9.1-1";
717801 knownRockspec = (fetchurl {
@@ -731,7 +815,7 @@ lrexlib-pcre = buildLuarocksPackage {
731815}
732816 '') ["date" "path"]) ;
733817
734− disabled = (luaOlder "5.1");
818+ disabled = with lua; (luaOlder "5.1");
735819 propagatedBuildInputs = [ lua ];
736820
737821 meta = {
@@ -740,9 +824,12 @@ lrexlib-pcre = buildLuarocksPackage {
740824 maintainers = with lib.maintainers; [ vyp ];
741825 license.fullName = "MIT/X11";
742826 };
743−};
827+}) {};
744828
745−lrexlib-posix = buildLuarocksPackage {
829+lrexlib-posix = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
830+, fetchgit, lua
831+}:
832+buildLuarocksPackage {
746833 pname = "lrexlib-posix";
747834 version = "2.9.1-1";
748835 knownRockspec = (fetchurl {
@@ -762,7 +849,7 @@ lrexlib-posix = buildLuarocksPackage {
762849}
763850 '') ["date" "path"]) ;
764851
765− disabled = (luaOlder "5.1");
852+ disabled = with lua; (luaOlder "5.1");
766853 propagatedBuildInputs = [ lua ];
767854
768855 meta = {
@@ -770,9 +857,12 @@ lrexlib-posix = buildLuarocksPackage {
770857 description = "Regular expression library binding (POSIX flavour).";
771858 license.fullName = "MIT/X11";
772859 };
773−};
860+}) {};
774861
775−lua-cjson = buildLuarocksPackage {
862+lua-cjson = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
863+, fetchgit, lua
864+}:
865+buildLuarocksPackage {
776866 pname = "lua-cjson";
777867 version = "2.1.0.6-1";
778868 knownRockspec = (fetchurl {
@@ -792,7 +882,7 @@ lua-cjson = buildLuarocksPackage {
792882}
793883 '') ["date" "path"]) ;
794884
795− disabled = (luaOlder "5.1");
885+ disabled = with lua; (luaOlder "5.1");
796886 propagatedBuildInputs = [ lua ];
797887
798888 meta = {
@@ -800,9 +890,12 @@ lua-cjson = buildLuarocksPackage {
800890 description = "A fast JSON encoding/parsing module";
801891 license.fullName = "MIT";
802892 };
803−};
893+}) {};
804894
805−lua-cmsgpack = buildLuarocksPackage {
895+lua-cmsgpack = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
896+, fetchgit, lua
897+}:
898+buildLuarocksPackage {
806899 pname = "lua-cmsgpack";
807900 version = "0.4.0-0";
808901 knownRockspec = (fetchurl {
@@ -822,7 +915,7 @@ lua-cmsgpack = buildLuarocksPackage {
822915}
823916 '') ["date" "path"]) ;
824917
825− disabled = (luaOlder "5.1");
918+ disabled = with lua; (luaOlder "5.1");
826919 propagatedBuildInputs = [ lua ];
827920
828921 meta = {
@@ -830,9 +923,12 @@ lua-cmsgpack = buildLuarocksPackage {
830923 description = "MessagePack C implementation and bindings for Lua 5.1/5.2/5.3";
831924 license.fullName = "Two-clause BSD";
832925 };
833−};
926+}) {};
834927
835−lua-iconv = buildLuarocksPackage {
928+lua-iconv = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
929+, fetchurl, lua
930+}:
931+buildLuarocksPackage {
836932 pname = "lua-iconv";
837933 version = "7-3";
838934 knownRockspec = (fetchurl {
@@ -844,7 +940,7 @@ lua-iconv = buildLuarocksPackage {
844940 sha256 = "02dg5x79fg5mwsycr0fj6w04zykdpiki9xjswkkwzdalqwaikny1";
845941 };
846942
847− disabled = (luaOlder "5.1");
943+ disabled = with lua; (luaOlder "5.1");
848944 propagatedBuildInputs = [ lua ];
849945
850946 meta = {
@@ -852,9 +948,12 @@ lua-iconv = buildLuarocksPackage {
852948 description = "Lua binding to the iconv";
853949 license.fullName = "MIT/X11";
854950 };
855−};
951+}) {};
856952
857−lua-lsp = buildLuarocksPackage {
953+lua-lsp = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
954+, fetchgit, lua, dkjson, lpeglabel, inspect
955+}:
956+buildLuarocksPackage {
858957 pname = "lua-lsp";
859958 version = "0.1.0-2";
860959 knownRockspec = (fetchurl {
@@ -874,7 +973,7 @@ lua-lsp = buildLuarocksPackage {
874973}
875974 '') ["date" "path"]) ;
876975
877− disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
976+ disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4");
878977 propagatedBuildInputs = [ lua dkjson lpeglabel inspect ];
879978
880979 meta = {
@@ -882,9 +981,12 @@ lua-lsp = buildLuarocksPackage {
882981 description = "A Language Server implementation for lua, the language";
883982 license.fullName = "MIT";
884983 };
885−};
984+}) {};
886985
887−lua-messagepack = buildLuarocksPackage {
986+lua-messagepack = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
987+, fetchurl, lua
988+}:
989+buildLuarocksPackage {
888990 pname = "lua-messagepack";
889991 version = "0.5.2-1";
890992 knownRockspec = (fetchurl {
@@ -896,7 +998,7 @@ lua-messagepack = buildLuarocksPackage {
896998 sha256 = "1jgi944d0vx4zs9lrphys9pw0wrsibip93sh141qjwymrjyjg1nc";
897999 };
8981000
899− disabled = (luaOlder "5.1");
1001+ disabled = with lua; (luaOlder "5.1");
9001002 propagatedBuildInputs = [ lua ];
9011003
9021004 meta = {
@@ -904,9 +1006,12 @@ lua-messagepack = buildLuarocksPackage {
9041006 description = "a pure Lua implementation of the MessagePack serialization format";
9051007 license.fullName = "MIT/X11";
9061008 };
907−};
1009+}) {};
9081010
909−lua-resty-http = buildLuarocksPackage {
1011+lua-resty-http = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1012+, fetchgit, lua
1013+}:
1014+buildLuarocksPackage {
9101015 pname = "lua-resty-http";
9111016 version = "0.16.1-0";
9121017 knownRockspec = (fetchurl {
@@ -926,7 +1031,7 @@ lua-resty-http = buildLuarocksPackage {
9261031}
9271032 '') ["date" "path"]) ;
9281033
929− disabled = (luaOlder "5.1");
1034+ disabled = with lua; (luaOlder "5.1");
9301035 propagatedBuildInputs = [ lua ];
9311036
9321037 meta = {
@@ -934,9 +1039,12 @@ lua-resty-http = buildLuarocksPackage {
9341039 description = "Lua HTTP client cosocket driver for OpenResty / ngx_lua.";
9351040 license.fullName = "2-clause BSD";
9361041 };
937−};
1042+}) {};
9381043
939−lua-resty-jwt = buildLuarocksPackage {
1044+lua-resty-jwt = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1045+, fetchgit, lua, lua-resty-openssl
1046+}:
1047+buildLuarocksPackage {
9401048 pname = "lua-resty-jwt";
9411049 version = "0.2.3-0";
9421050 knownRockspec = (fetchurl {
@@ -956,7 +1064,7 @@ lua-resty-jwt = buildLuarocksPackage {
9561064}
9571065 '') ["date" "path"]) ;
9581066
959− disabled = (luaOlder "5.1");
1067+ disabled = with lua; (luaOlder "5.1");
9601068 propagatedBuildInputs = [ lua lua-resty-openssl ];
9611069
9621070 meta = {
@@ -964,9 +1072,12 @@ lua-resty-jwt = buildLuarocksPackage {
9641072 description = "JWT for ngx_lua and LuaJIT.";
9651073 license.fullName = "Apache License Version 2";
9661074 };
967−};
1075+}) {};
9681076
969−lua-resty-openidc = buildLuarocksPackage {
1077+lua-resty-openidc = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1078+, fetchgit, lua, lua-resty-http, lua-resty-session, lua-resty-jwt
1079+}:
1080+buildLuarocksPackage {
9701081 pname = "lua-resty-openidc";
9711082 version = "1.7.4-1";
9721083 knownRockspec = (fetchurl {
@@ -986,7 +1097,7 @@ lua-resty-openidc = buildLuarocksPackage {
9861097}
9871098 '') ["date" "path"]) ;
9881099
989− disabled = (luaOlder "5.1");
1100+ disabled = with lua; (luaOlder "5.1");
9901101 propagatedBuildInputs = [ lua lua-resty-http lua-resty-session lua-resty-jwt ];
9911102
9921103 meta = {
@@ -994,13 +1105,15 @@ lua-resty-openidc = buildLuarocksPackage {
9941105 description = "A library for NGINX implementing the OpenID Connect Relying Party (RP) and the OAuth 2.0 Resource Server (RS) functionality";
9951106 license.fullName = "Apache 2.0";
9961107 };
997−};
1108+}) {};
9981109
999−lua-resty-openssl = buildLuarocksPackage {
1110+lua-resty-openssl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1111+, fetchgit}:
1112+buildLuarocksPackage {
10001113 pname = "lua-resty-openssl";
10011114 version = "0.7.5-1";
10021115 knownRockspec = (fetchurl {
1003− url = "https://luafr.org/luarocks/lua-resty-openssl-0.7.5-1.rockspec";
1116+ url = "https://luarocks.org/lua-resty-openssl-0.7.5-1.rockspec";
10041117 sha256 = "13v14in9cgmjgarmy6br9629ns1qlhw7a30c061y6gncjannnv6y";
10051118 }).outPath;
10061119 src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@@ -1022,9 +1135,12 @@ lua-resty-openssl = buildLuarocksPackage {
10221135 description = "No summary";
10231136 license.fullName = "BSD";
10241137 };
1025−};
1138+}) {};
10261139
1027−lua-resty-session = buildLuarocksPackage {
1140+lua-resty-session = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1141+, fetchgit, lua
1142+}:
1143+buildLuarocksPackage {
10281144 pname = "lua-resty-session";
10291145 version = "3.8-1";
10301146 knownRockspec = (fetchurl {
@@ -1044,7 +1160,7 @@ lua-resty-session = buildLuarocksPackage {
10441160}
10451161 '') ["date" "path"]) ;
10461162
1047− disabled = (luaOlder "5.1");
1163+ disabled = with lua; (luaOlder "5.1");
10481164 propagatedBuildInputs = [ lua ];
10491165
10501166 meta = {
@@ -1052,13 +1168,15 @@ lua-resty-session = buildLuarocksPackage {
10521168 description = "Session Library for OpenResty – Flexible and Secure";
10531169 license.fullName = "BSD";
10541170 };
1055−};
1171+}) {};
10561172
1057−lua-term = buildLuarocksPackage {
1173+lua-term = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1174+, fetchurl}:
1175+buildLuarocksPackage {
10581176 pname = "lua-term";
10591177 version = "0.7-1";
10601178 knownRockspec = (fetchurl {
1061− url = "https://luarocks.org/lua-term-0.7-1.rockspec";
1179+ url = "https://luafr.org/luarocks/lua-term-0.7-1.rockspec";
10621180 sha256 = "0r9g5jw7pqr1dyj6w58dqlr7y7l0jp077n8nnji4phf10biyrvg2";
10631181 }).outPath;
10641182 src = fetchurl {
@@ -1072,9 +1190,12 @@ lua-term = buildLuarocksPackage {
10721190 description = "Terminal functions for Lua";
10731191 license.fullName = "MIT/X11";
10741192 };
1075−};
1193+}) {};
10761194
1077−lua-toml = buildLuarocksPackage {
1195+lua-toml = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1196+, fetchgit, lua
1197+}:
1198+buildLuarocksPackage {
10781199 pname = "lua-toml";
10791200 version = "2.0-1";
10801201 knownRockspec = (fetchurl {
@@ -1094,7 +1215,7 @@ lua-toml = buildLuarocksPackage {
10941215}
10951216 '') ["date" "path"]) ;
10961217
1097− disabled = (luaOlder "5.1");
1218+ disabled = with lua; (luaOlder "5.1");
10981219 propagatedBuildInputs = [ lua ];
10991220
11001221 meta = {
@@ -1102,13 +1223,16 @@ lua-toml = buildLuarocksPackage {
11021223 description = "toml decoder/encoder for Lua";
11031224 license.fullName = "MIT";
11041225 };
1105−};
1226+}) {};
11061227
1107−lua-yajl = buildLuarocksPackage {
1228+lua-yajl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1229+, fetchgit, lua
1230+}:
1231+buildLuarocksPackage {
11081232 pname = "lua-yajl";
11091233 version = "2.0-1";
11101234 knownRockspec = (fetchurl {
1111− url = "https://luarocks.org/lua-yajl-2.0-1.rockspec";
1235+ url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua-yajl-2.0-1.rockspec";
11121236 sha256 = "0h600zgq5qc9z3cid1kr35q3qb98alg0m3qf0a3mfj33hya6pcxp";
11131237 }).outPath;
11141238 src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@@ -1124,7 +1248,7 @@ lua-yajl = buildLuarocksPackage {
11241248}
11251249 '') ["date" "path"]) ;
11261250
1127− disabled = (luaOlder "5.1");
1251+ disabled = with lua; (luaOlder "5.1");
11281252 propagatedBuildInputs = [ lua ];
11291253
11301254 meta = {
@@ -1133,9 +1257,12 @@ lua-yajl = buildLuarocksPackage {
11331257 maintainers = with lib.maintainers; [ pstn ];
11341258 license.fullName = "MIT/X11";
11351259 };
1136−};
1260+}) {};
11371261
1138−lua-zlib = buildLuarocksPackage {
1262+lua-zlib = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1263+, fetchgit, lua
1264+}:
1265+buildLuarocksPackage {
11391266 pname = "lua-zlib";
11401267 version = "1.2-1";
11411268 knownRockspec = (fetchurl {
@@ -1155,7 +1282,7 @@ lua-zlib = buildLuarocksPackage {
11551282}
11561283 '') ["date" "path"]) ;
11571284
1158− disabled = (luaOlder "5.1") || (luaAtLeast "5.5");
1285+ disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5");
11591286 propagatedBuildInputs = [ lua ];
11601287
11611288 meta = {
@@ -1164,9 +1291,12 @@ lua-zlib = buildLuarocksPackage {
11641291 maintainers = with lib.maintainers; [ koral ];
11651292 license.fullName = "MIT";
11661293 };
1167−};
1294+}) {};
11681295
1169−lua_cliargs = buildLuarocksPackage {
1296+lua_cliargs = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1297+, fetchurl, lua
1298+}:
1299+buildLuarocksPackage {
11701300 pname = "lua_cliargs";
11711301 version = "3.0-2";
11721302
@@ -1175,7 +1305,7 @@ lua_cliargs = buildLuarocksPackage {
11751305 sha256 = "0vhpgmy9a8wlxp8a15pnfqfk0aj7pyyb5m41nnfxynx580a6y7cp";
11761306 };
11771307
1178− disabled = (luaOlder "5.1");
1308+ disabled = with lua; (luaOlder "5.1");
11791309 propagatedBuildInputs = [ lua ];
11801310
11811311 meta = {
@@ -1183,9 +1313,12 @@ lua_cliargs = buildLuarocksPackage {
11831313 description = "A command-line argument parser.";
11841314 license.fullName = "MIT <http://opensource.org/licenses/MIT>";
11851315 };
1186−};
1316+}) {};
11871317
1188−luabitop = buildLuarocksPackage {
1318+luabitop = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1319+, fetchgit, lua
1320+}:
1321+buildLuarocksPackage {
11891322 pname = "luabitop";
11901323 version = "1.0.2-3";
11911324
@@ -1202,7 +1335,7 @@ luabitop = buildLuarocksPackage {
12021335}
12031336 '') ["date" "path"]) ;
12041337
1205− disabled = (luaOlder "5.1") || (luaAtLeast "5.3");
1338+ disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.3");
12061339 propagatedBuildInputs = [ lua ];
12071340
12081341 meta = {
@@ -1210,21 +1343,24 @@ luabitop = buildLuarocksPackage {
12101343 description = "Lua Bit Operations Module";
12111344 license.fullName = "MIT/X license";
12121345 };
1213−};
1346+}) {};
12141347
1215−luacheck = buildLuarocksPackage {
1348+luacheck = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1349+, fetchgit, lua, argparse, luafilesystem
1350+}:
1351+buildLuarocksPackage {
12161352 pname = "luacheck";
1217− version = "0.24.0-2";
1353+ version = "0.25.0-1";
12181354 knownRockspec = (fetchurl {
1219− url = "https://luarocks.org/luacheck-0.24.0-2.rockspec";
1220− sha256 = "1x8n7w1mdr1bmmbw38syzi2612yyd7bbv4j2hnlk2k76qfcvkhf3";
1355+ url = "https://luarocks.org/luacheck-0.25.0-1.rockspec";
1356+ sha256 = "11mvbpnykibg0dx9sdh5x9gpvrhkmvrw76qvjz337x83f8gmvy91";
12211357 }).outPath;
12221358 src = fetchgit ( removeAttrs (builtins.fromJSON ''{
12231359 "url": "https://github.com/luarocks/luacheck.git",
1224− "rev": "6651c20d8495c380a49ca81662fcfd1ade6b2411",
1225− "date": "2020-08-20T19:21:52-03:00",
1226− "path": "/nix/store/8r4x8snxp0kjabn9bsxwh62pfczd8wma-luacheck",
1227− "sha256": "08jsqibksdvpl6mvf8d6rlh5pii78hqm3fkhbkgzrs6k8kk5a7lf",
1360+ "rev": "abf7386a892df4ce566fef9e4640ddbf9af78411",
1361+ "date": "2021-08-10T12:19:20-03:00",
1362+ "path": "/nix/store/9cdlf6c3y0087qwh48ky8ysxxx3lirlj-luacheck",
1363+ "sha256": "1ymfkr0qmg6idrrxf9x6mfq14skag8h09kl2qlalwiykicrdljs1",
12281364 "fetchLFS": false,
12291365 "fetchSubmodules": true,
12301366 "deepClone": false,
@@ -1232,7 +1368,7 @@ luacheck = buildLuarocksPackage {
12321368}
12331369 '') ["date" "path"]) ;
12341370
1235− disabled = (luaOlder "5.1");
1371+ disabled = with lua; (luaOlder "5.1");
12361372 propagatedBuildInputs = [ lua argparse luafilesystem ];
12371373
12381374 meta = {
@@ -1240,13 +1376,16 @@ luacheck = buildLuarocksPackage {
12401376 description = "A static analyzer and a linter for Lua";
12411377 license.fullName = "MIT";
12421378 };
1243−};
1379+}) {};
12441380
1245−luacov = buildLuarocksPackage {
1381+luacov = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1382+, fetchgit, lua
1383+}:
1384+buildLuarocksPackage {
12461385 pname = "luacov";
12471386 version = "0.15.0-1";
12481387 knownRockspec = (fetchurl {
1249− url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luacov-0.15.0-1.rockspec";
1388+ url = "https://luafr.org/luarocks/luacov-0.15.0-1.rockspec";
12501389 sha256 = "18byfl23c73pazi60hsx0vd74hqq80mzixab76j36cyn8k4ni9db";
12511390 }).outPath;
12521391 src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@@ -1262,7 +1401,7 @@ luacov = buildLuarocksPackage {
12621401}
12631402 '') ["date" "path"]) ;
12641403
1265− disabled = (luaOlder "5.1") || (luaAtLeast "5.5");
1404+ disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5");
12661405 propagatedBuildInputs = [ lua ];
12671406
12681407 meta = {
@@ -1270,9 +1409,12 @@ luacov = buildLuarocksPackage {
12701409 description = "Coverage analysis tool for Lua scripts";
12711410 license.fullName = "MIT";
12721411 };
1273−};
1412+}) {};
12741413
1275−luadbi = buildLuarocksPackage {
1414+luadbi = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1415+, fetchgit, lua
1416+}:
1417+buildLuarocksPackage {
12761418 pname = "luadbi";
12771419 version = "0.7.2-1";
12781420 knownRockspec = (fetchurl {
@@ -1292,7 +1434,7 @@ luadbi = buildLuarocksPackage {
12921434}
12931435 '') ["date" "path"]) ;
12941436
1295− disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
1437+ disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4");
12961438 propagatedBuildInputs = [ lua ];
12971439
12981440 meta = {
@@ -1300,13 +1442,16 @@ luadbi = buildLuarocksPackage {
13001442 description = "Database abstraction layer";
13011443 license.fullName = "MIT/X11";
13021444 };
1303−};
1445+}) {};
13041446
1305−luadbi-mysql = buildLuarocksPackage {
1447+luadbi-mysql = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1448+, fetchgit, lua, luadbi
1449+}:
1450+buildLuarocksPackage {
13061451 pname = "luadbi-mysql";
13071452 version = "0.7.2-1";
13081453 knownRockspec = (fetchurl {
1309− url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luadbi-mysql-0.7.2-1.rockspec";
1454+ url = "https://luarocks.org/luadbi-mysql-0.7.2-1.rockspec";
13101455 sha256 = "0gnyqnvcfif06rzzrdw6w6hchp4jrjiwm0rmfx2r8ljchj2bvml5";
13111456 }).outPath;
13121457 src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@@ -1322,7 +1467,7 @@ luadbi-mysql = buildLuarocksPackage {
13221467}
13231468 '') ["date" "path"]) ;
13241469
1325− disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
1470+ disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4");
13261471 propagatedBuildInputs = [ lua luadbi ];
13271472
13281473 meta = {
@@ -1330,13 +1475,16 @@ luadbi-mysql = buildLuarocksPackage {
13301475 description = "Database abstraction layer";
13311476 license.fullName = "MIT/X11";
13321477 };
1333−};
1478+}) {};
13341479
1335−luadbi-postgresql = buildLuarocksPackage {
1480+luadbi-postgresql = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1481+, fetchgit, lua, luadbi
1482+}:
1483+buildLuarocksPackage {
13361484 pname = "luadbi-postgresql";
13371485 version = "0.7.2-1";
13381486 knownRockspec = (fetchurl {
1339− url = "https://luarocks.org/luadbi-postgresql-0.7.2-1.rockspec";
1487+ url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luadbi-postgresql-0.7.2-1.rockspec";
13401488 sha256 = "07rx4agw4hjyzf8157apdwfqh9s26nqndmkr3wm7v09ygjvdjiix";
13411489 }).outPath;
13421490 src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@@ -1352,7 +1500,7 @@ luadbi-postgresql = buildLuarocksPackage {
13521500}
13531501 '') ["date" "path"]) ;
13541502
1355− disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
1503+ disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4");
13561504 propagatedBuildInputs = [ lua luadbi ];
13571505
13581506 meta = {
@@ -1360,9 +1508,12 @@ luadbi-postgresql = buildLuarocksPackage {
13601508 description = "Database abstraction layer";
13611509 license.fullName = "MIT/X11";
13621510 };
1363−};
1511+}) {};
13641512
1365−luadbi-sqlite3 = buildLuarocksPackage {
1513+luadbi-sqlite3 = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1514+, fetchgit, lua, luadbi
1515+}:
1516+buildLuarocksPackage {
13661517 pname = "luadbi-sqlite3";
13671518 version = "0.7.2-1";
13681519 knownRockspec = (fetchurl {
@@ -1382,7 +1533,7 @@ luadbi-sqlite3 = buildLuarocksPackage {
13821533}
13831534 '') ["date" "path"]) ;
13841535
1385− disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
1536+ disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4");
13861537 propagatedBuildInputs = [ lua luadbi ];
13871538
13881539 meta = {
@@ -1390,9 +1541,12 @@ luadbi-sqlite3 = buildLuarocksPackage {
13901541 description = "Database abstraction layer";
13911542 license.fullName = "MIT/X11";
13921543 };
1393−};
1544+}) {};
13941545
1395−luaepnf = buildLuarocksPackage {
1546+luaepnf = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1547+, fetchgit, lua, lpeg
1548+}:
1549+buildLuarocksPackage {
13961550 pname = "luaepnf";
13971551 version = "0.3-2";
13981552 knownRockspec = (fetchurl {
@@ -1412,7 +1566,7 @@ luaepnf = buildLuarocksPackage {
14121566}
14131567 '') ["date" "path"]) ;
14141568
1415− disabled = (luaOlder "5.1") || (luaAtLeast "5.5");
1569+ disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5");
14161570 propagatedBuildInputs = [ lua lpeg ];
14171571
14181572 meta = {
@@ -1420,9 +1574,12 @@ luaepnf = buildLuarocksPackage {
14201574 description = "Extended PEG Notation Format (easy grammars for LPeg)";
14211575 license.fullName = "MIT";
14221576 };
1423−};
1577+}) {};
14241578
1425−luaevent = buildLuarocksPackage {
1579+luaevent = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1580+, fetchurl, lua
1581+}:
1582+buildLuarocksPackage {
14261583 pname = "luaevent";
14271584 version = "0.4.6-1";
14281585 knownRockspec = (fetchurl {
@@ -1434,7 +1591,7 @@ luaevent = buildLuarocksPackage {
14341591 sha256 = "0pbh315d3p7hxgzmbhphkcldxv2dadbka96131b8j5914nxvl4nx";
14351592 };
14361593
1437− disabled = (luaOlder "5.1");
1594+ disabled = with lua; (luaOlder "5.1");
14381595 propagatedBuildInputs = [ lua ];
14391596
14401597 meta = {
@@ -1442,9 +1599,12 @@ luaevent = buildLuarocksPackage {
14421599 description = "libevent binding for Lua";
14431600 license.fullName = "MIT";
14441601 };
1445−};
1602+}) {};
14461603
1447−luaexpat = buildLuarocksPackage {
1604+luaexpat = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1605+, fetchurl, lua
1606+}:
1607+buildLuarocksPackage {
14481608 pname = "luaexpat";
14491609 version = "1.3.0-1";
14501610 knownRockspec = (fetchurl {
@@ -1456,7 +1616,7 @@ luaexpat = buildLuarocksPackage {
14561616 sha256 = "1hvxqngn0wf5642i5p3vcyhg3pmp102k63s9ry4jqyyqc1wkjq6h";
14571617 };
14581618
1459− disabled = (luaOlder "5.1");
1619+ disabled = with lua; (luaOlder "5.1");
14601620 propagatedBuildInputs = [ lua ];
14611621
14621622 meta = {
@@ -1465,9 +1625,12 @@ luaexpat = buildLuarocksPackage {
14651625 maintainers = with lib.maintainers; [ arobyn flosse ];
14661626 license.fullName = "MIT/X11";
14671627 };
1468−};
1628+}) {};
14691629
1470−luaffi = buildLuarocksPackage {
1630+luaffi = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1631+, fetchgit, lua
1632+}:
1633+buildLuarocksPackage {
14711634 pname = "luaffi";
14721635 version = "scm-1";
14731636 knownRockspec = (fetchurl {
@@ -1487,7 +1650,7 @@ luaffi = buildLuarocksPackage {
14871650}
14881651 '') ["date" "path"]) ;
14891652
1490− disabled = (luaOlder "5.1");
1653+ disabled = with lua; (luaOlder "5.1");
14911654 propagatedBuildInputs = [ lua ];
14921655
14931656 meta = {
@@ -1495,9 +1658,12 @@ luaffi = buildLuarocksPackage {
14951658 description = "FFI library for calling C functions from lua";
14961659 license.fullName = "BSD";
14971660 };
1498−};
1661+}) {};
14991662
1500−luafilesystem = buildLuarocksPackage {
1663+luafilesystem = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1664+, fetchgit, lua
1665+}:
1666+buildLuarocksPackage {
15011667 pname = "luafilesystem";
15021668 version = "1.7.0-2";
15031669 knownRockspec = (fetchurl {
@@ -1517,7 +1683,7 @@ luafilesystem = buildLuarocksPackage {
15171683}
15181684 '') ["date" "path"]) ;
15191685
1520− disabled = (luaOlder "5.1");
1686+ disabled = with lua; (luaOlder "5.1");
15211687 propagatedBuildInputs = [ lua ];
15221688
15231689 meta = {
@@ -1526,9 +1692,12 @@ luafilesystem = buildLuarocksPackage {
15261692 maintainers = with lib.maintainers; [ flosse ];
15271693 license.fullName = "MIT/X11";
15281694 };
1529−};
1695+}) {};
15301696
1531−lualogging = buildLuarocksPackage {
1697+lualogging = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1698+, fetchgit, luasocket
1699+}:
1700+buildLuarocksPackage {
15321701 pname = "lualogging";
15331702 version = "1.5.2-1";
15341703 knownRockspec = (fetchurl {
@@ -1555,9 +1724,12 @@ lualogging = buildLuarocksPackage {
15551724 description = "A simple API to use logging features";
15561725 license.fullName = "MIT/X11";
15571726 };
1558−};
1727+}) {};
15591728
1560−luaossl = buildLuarocksPackage {
1729+luaossl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1730+, fetchurl, lua
1731+}:
1732+buildLuarocksPackage {
15611733 pname = "luaossl";
15621734 version = "20200709-0";
15631735 knownRockspec = (fetchurl {
@@ -1576,9 +1748,12 @@ luaossl = buildLuarocksPackage {
15761748 description = "Most comprehensive OpenSSL module in the Lua universe.";
15771749 license.fullName = "MIT/X11";
15781750 };
1579−};
1751+}) {};
15801752
1581−luaposix = buildLuarocksPackage {
1753+luaposix = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1754+, fetchurl, bit32, lua
1755+}:
1756+buildLuarocksPackage {
15821757 pname = "luaposix";
15831758 version = "34.1.1-1";
15841759 knownRockspec = (fetchurl {
@@ -1590,7 +1765,7 @@ luaposix = buildLuarocksPackage {
15901765 sha256 = "1xqx764ji054jphxdhkynsmwzqzkfgxqfizxkf70za6qfrvnl3yh";
15911766 };
15921767
1593− disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
1768+ disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4");
15941769 propagatedBuildInputs = [ bit32 lua ];
15951770
15961771 meta = {
@@ -1599,9 +1774,12 @@ luaposix = buildLuarocksPackage {
15991774 maintainers = with lib.maintainers; [ vyp lblasc ];
16001775 license.fullName = "MIT/X11";
16011776 };
1602−};
1777+}) {};
16031778
1604−luarepl = buildLuarocksPackage {
1779+luarepl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1780+, fetchurl, lua
1781+}:
1782+buildLuarocksPackage {
16051783 pname = "luarepl";
16061784 version = "0.9-1";
16071785 knownRockspec = (fetchurl {
@@ -1613,7 +1791,7 @@ luarepl = buildLuarocksPackage {
16131791 sha256 = "04xka7b84d9mrz3gyf8ywhw08xp65v8jrnzs8ry8k9540aqs721w";
16141792 };
16151793
1616− disabled = (luaOlder "5.1");
1794+ disabled = with lua; (luaOlder "5.1");
16171795 propagatedBuildInputs = [ lua ];
16181796
16191797 meta = {
@@ -1621,9 +1799,12 @@ luarepl = buildLuarocksPackage {
16211799 description = "A reusable REPL component for Lua, written in Lua";
16221800 license.fullName = "MIT/X11";
16231801 };
1624−};
1802+}) {};
16251803
1626−luasec = buildLuarocksPackage {
1804+luasec = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1805+, fetchgit, lua, luasocket
1806+}:
1807+buildLuarocksPackage {
16271808 pname = "luasec";
16281809 version = "1.0.2-1";
16291810 knownRockspec = (fetchurl {
@@ -1643,7 +1824,7 @@ luasec = buildLuarocksPackage {
16431824}
16441825 '') ["date" "path"]) ;
16451826
1646− disabled = (luaOlder "5.1");
1827+ disabled = with lua; (luaOlder "5.1");
16471828 propagatedBuildInputs = [ lua luasocket ];
16481829
16491830 meta = {
@@ -1652,13 +1833,16 @@ luasec = buildLuarocksPackage {
16521833 maintainers = with lib.maintainers; [ flosse ];
16531834 license.fullName = "MIT";
16541835 };
1655−};
1836+}) {};
16561837
1657−luasocket = buildLuarocksPackage {
1838+luasocket = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1839+, fetchurl, lua
1840+}:
1841+buildLuarocksPackage {
16581842 pname = "luasocket";
16591843 version = "3.0rc1-2";
16601844 knownRockspec = (fetchurl {
1661− url = "https://luarocks.org/luasocket-3.0rc1-2.rockspec";
1845+ url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luasocket-3.0rc1-2.rockspec";
16621846 sha256 = "17fbkihp4zypv5wwgxz8dnghj37pf5bhpi2llg4gbljp1bl2f42c";
16631847 }).outPath;
16641848 src = fetchurl {
@@ -1666,7 +1850,7 @@ luasocket = buildLuarocksPackage {
16661850 sha256 = "0x0fg07cg08ybgkpzif7zmzaaq5ga979rxwd9rj95kfws9bbrl0y";
16671851 };
16681852
1669− disabled = (luaOlder "5.1");
1853+ disabled = with lua; (luaOlder "5.1");
16701854 propagatedBuildInputs = [ lua ];
16711855
16721856 meta = {
@@ -1674,9 +1858,12 @@ luasocket = buildLuarocksPackage {
16741858 description = "Network support for the Lua language";
16751859 license.fullName = "MIT";
16761860 };
1677−};
1861+}) {};
16781862
1679−luasql-sqlite3 = buildLuarocksPackage {
1863+luasql-sqlite3 = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1864+, fetchgit, lua
1865+}:
1866+buildLuarocksPackage {
16801867 pname = "luasql-sqlite3";
16811868 version = "2.6.0-1";
16821869 knownRockspec = (fetchurl {
@@ -1685,10 +1872,10 @@ luasql-sqlite3 = buildLuarocksPackage {
16851872 }).outPath;
16861873 src = fetchgit ( removeAttrs (builtins.fromJSON ''{
16871874 "url": "https://github.com/keplerproject/luasql.git",
1688− "rev": "69f68a858134d6adbe9b65a902dcd3f60cd6a7ce",
1689− "date": "2021-08-27T15:17:22-03:00",
1690− "path": "/nix/store/2374agarn72cnlnk2vripfy1zz2y50la-luasql",
1691− "sha256": "13xs1g67d2p69x4wzxk1h97xh25388h0kkh9bjgw3l1yss9zlxhx",
1875+ "rev": "ce22164f63783afac9c644fd37c231e56fc097cb",
1876+ "date": "2021-10-14T09:38:24-03:00",
1877+ "path": "/nix/store/h8r8axcc76x7y6gwc2jzsmr7h2lqgbxa-luasql",
1878+ "sha256": "10gq3x7vqkafvfk9fs4039rl1xhnqpl2v60z4qpd96wbcy205gnk",
16921879 "fetchLFS": false,
16931880 "fetchSubmodules": true,
16941881 "deepClone": false,
@@ -1696,7 +1883,7 @@ luasql-sqlite3 = buildLuarocksPackage {
16961883}
16971884 '') ["date" "path"]) ;
16981885
1699− disabled = (luaOlder "5.1");
1886+ disabled = with lua; (luaOlder "5.1");
17001887 propagatedBuildInputs = [ lua ];
17011888
17021889 meta = {
@@ -1705,9 +1892,12 @@ luasql-sqlite3 = buildLuarocksPackage {
17051892 maintainers = with lib.maintainers; [ vyp ];
17061893 license.fullName = "MIT/X11";
17071894 };
1708−};
1895+}) {};
17091896
1710−luassert = buildLuarocksPackage {
1897+luassert = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1898+, fetchurl, lua, say
1899+}:
1900+buildLuarocksPackage {
17111901 pname = "luassert";
17121902 version = "1.8.0-0";
17131903 knownRockspec = (fetchurl {
@@ -1719,7 +1909,7 @@ luassert = buildLuarocksPackage {
17191909 sha256 = "0xlwlb32215524bg33svp1ci8mdvh9wykchl8dkhihpxcd526mar";
17201910 };
17211911
1722− disabled = (luaOlder "5.1");
1912+ disabled = with lua; (luaOlder "5.1");
17231913 propagatedBuildInputs = [ lua say ];
17241914
17251915 meta = {
@@ -1727,9 +1917,12 @@ luassert = buildLuarocksPackage {
17271917 description = "Lua Assertions Extension";
17281918 license.fullName = "MIT <http://opensource.org/licenses/MIT>";
17291919 };
1730−};
1920+}) {};
17311921
1732−luasystem = buildLuarocksPackage {
1922+luasystem = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1923+, fetchurl, lua
1924+}:
1925+buildLuarocksPackage {
17331926 pname = "luasystem";
17341927 version = "0.2.1-0";
17351928 knownRockspec = (fetchurl {
@@ -1741,7 +1934,7 @@ luasystem = buildLuarocksPackage {
17411934 sha256 = "150bbklchh02gsvpngv56xrrlxxvwpqwrh0yy6z95fnvks7gd0qb";
17421935 };
17431936
1744− disabled = (luaOlder "5.1");
1937+ disabled = with lua; (luaOlder "5.1");
17451938 propagatedBuildInputs = [ lua ];
17461939
17471940 meta = {
@@ -1749,9 +1942,12 @@ luasystem = buildLuarocksPackage {
17491942 description = "Platform independent system calls for Lua.";
17501943 license.fullName = "MIT <http://opensource.org/licenses/MIT>";
17511944 };
1752−};
1945+}) {};
17531946
1754−luautf8 = buildLuarocksPackage {
1947+luautf8 = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1948+, fetchurl, lua
1949+}:
1950+buildLuarocksPackage {
17551951 pname = "luautf8";
17561952 version = "0.1.3-1";
17571953 knownRockspec = (fetchurl {
@@ -1763,7 +1959,7 @@ luautf8 = buildLuarocksPackage {
17631959 sha256 = "02rf8jmazmi8rp3i5v4jsz0d7mrf1747qszsl8i2hv1sl0ik92r0";
17641960 };
17651961
1766− disabled = (luaOlder "5.1");
1962+ disabled = with lua; (luaOlder "5.1");
17671963 propagatedBuildInputs = [ lua ];
17681964
17691965 meta = {
@@ -1772,9 +1968,12 @@ luautf8 = buildLuarocksPackage {
17721968 maintainers = with lib.maintainers; [ pstn ];
17731969 license.fullName = "MIT";
17741970 };
1775−};
1971+}) {};
17761972
1777−luazip = buildLuarocksPackage {
1973+luazip = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
1974+, fetchgit, lua
1975+}:
1976+buildLuarocksPackage {
17781977 pname = "luazip";
17791978 version = "1.2.7-1";
17801979 knownRockspec = (fetchurl {
@@ -1794,7 +1993,7 @@ luazip = buildLuarocksPackage {
17941993}
17951994 '') ["date" "path"]) ;
17961995
1797− disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
1996+ disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4");
17981997 propagatedBuildInputs = [ lua ];
17991998
18001999 meta = {
@@ -1802,9 +2001,12 @@ luazip = buildLuarocksPackage {
18022001 description = "Library for reading files inside zip files";
18032002 license.fullName = "MIT";
18042003 };
1805−};
2004+}) {};
18062005
1807−luuid = buildLuarocksPackage {
2006+luuid = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
2007+, fetchurl, lua
2008+}:
2009+buildLuarocksPackage {
18082010 pname = "luuid";
18092011 version = "20120509-2";
18102012 knownRockspec = (fetchurl {
@@ -1816,7 +2018,7 @@ luuid = buildLuarocksPackage {
18162018 sha256 = "1bfkj613d05yps3fivmz0j1bxf2zkg9g1yl0ifffgw0vy00hpnvm";
18172019 };
18182020
1819− disabled = (luaOlder "5.2") || (luaAtLeast "5.4");
2021+ disabled = with lua; (luaOlder "5.2") || (luaAtLeast "5.4");
18202022 propagatedBuildInputs = [ lua ];
18212023
18222024 meta = {
@@ -1824,9 +2026,12 @@ luuid = buildLuarocksPackage {
18242026 description = "A library for UUID generation";
18252027 license.fullName = "Public domain";
18262028 };
1827−};
2029+}) {};
18282030
1829−luv = buildLuarocksPackage {
2031+luv = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
2032+, fetchurl, lua
2033+}:
2034+buildLuarocksPackage {
18302035 pname = "luv";
18312036 version = "1.42.0-0";
18322037 knownRockspec = (fetchurl {
@@ -1838,7 +2043,7 @@ luv = buildLuarocksPackage {
18382043 sha256 = "0dkzjkkm0h516ag6sfz5iji761y9slrcfw325f39zkda1sfql8mm";
18392044 };
18402045
1841− disabled = (luaOlder "5.1");
2046+ disabled = with lua; (luaOlder "5.1");
18422047 propagatedBuildInputs = [ lua ];
18432048
18442049 meta = {
@@ -1846,13 +2051,16 @@ luv = buildLuarocksPackage {
18462051 description = "Bare libuv bindings for lua";
18472052 license.fullName = "Apache 2.0";
18482053 };
1849−};
2054+}) {};
18502055
1851−lyaml = buildLuarocksPackage {
2056+lyaml = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
2057+, fetchurl, lua
2058+}:
2059+buildLuarocksPackage {
18522060 pname = "lyaml";
18532061 version = "6.2.7-1";
18542062 knownRockspec = (fetchurl {
1855− url = "https://luarocks.org/lyaml-6.2.7-1.rockspec";
2063+ url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lyaml-6.2.7-1.rockspec";
18562064 sha256 = "0m5bnzg24nyk35gcn4rydgzk0ysk1f6rslxwxd0w3drl1bg64zja";
18572065 }).outPath;
18582066 src = fetchurl {
@@ -1860,7 +2068,7 @@ lyaml = buildLuarocksPackage {
18602068 sha256 = "165mr3krf8g8070j4ax9z0j2plfbdwb8x2zk2hydpqaqa0kcdb0c";
18612069 };
18622070
1863− disabled = (luaOlder "5.1") || (luaAtLeast "5.5");
2071+ disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5");
18642072 propagatedBuildInputs = [ lua ];
18652073
18662074 meta = {
@@ -1869,9 +2077,12 @@ lyaml = buildLuarocksPackage {
18692077 maintainers = with lib.maintainers; [ lblasc ];
18702078 license.fullName = "MIT/X11";
18712079 };
1872−};
2080+}) {};
18732081
1874−markdown = buildLuarocksPackage {
2082+markdown = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
2083+, fetchgit, lua
2084+}:
2085+buildLuarocksPackage {
18752086 pname = "markdown";
18762087 version = "0.33-1";
18772088 knownRockspec = (fetchurl {
@@ -1891,7 +2102,7 @@ markdown = buildLuarocksPackage {
18912102}
18922103 '') ["date" "path"]) ;
18932104
1894− disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
2105+ disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4");
18952106 propagatedBuildInputs = [ lua ];
18962107
18972108 meta = {
@@ -1899,9 +2110,12 @@ markdown = buildLuarocksPackage {
18992110 description = "Markdown text-to-html markup system.";
19002111 license.fullName = "MIT/X11";
19012112 };
1902−};
2113+}) {};
19032114
1904−mediator_lua = buildLuarocksPackage {
2115+mediator_lua = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
2116+, fetchurl, lua
2117+}:
2118+buildLuarocksPackage {
19052119 pname = "mediator_lua";
19062120 version = "1.1.2-0";
19072121 knownRockspec = (fetchurl {
@@ -1913,7 +2127,7 @@ mediator_lua = buildLuarocksPackage {
19132127 sha256 = "16zzzhiy3y35v8advmlkzpryzxv5vji7727vwkly86q8sagqbxgs";
19142128 };
19152129
1916− disabled = (luaOlder "5.1");
2130+ disabled = with lua; (luaOlder "5.1");
19172131 propagatedBuildInputs = [ lua ];
19182132
19192133 meta = {
@@ -1921,9 +2135,12 @@ mediator_lua = buildLuarocksPackage {
19212135 description = "Event handling through channels";
19222136 license.fullName = "MIT <http://opensource.org/licenses/MIT>";
19232137 };
1924−};
2138+}) {};
19252139
1926−moonscript = buildLuarocksPackage {
2140+moonscript = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
2141+, fetchgit, lua, lpeg, alt-getopt, luafilesystem
2142+}:
2143+buildLuarocksPackage {
19272144 pname = "moonscript";
19282145 version = "0.5.0-1";
19292146 knownRockspec = (fetchurl {
@@ -1943,7 +2160,7 @@ moonscript = buildLuarocksPackage {
19432160}
19442161 '') ["date" "path"]) ;
19452162
1946− disabled = (luaOlder "5.1");
2163+ disabled = with lua; (luaOlder "5.1");
19472164 propagatedBuildInputs = [ lua lpeg alt-getopt luafilesystem ];
19482165
19492166 meta = {
@@ -1952,29 +2169,34 @@ moonscript = buildLuarocksPackage {
19522169 maintainers = with lib.maintainers; [ arobyn ];
19532170 license.fullName = "MIT";
19542171 };
1955−};
2172+}) {};
19562173
1957−mpack = buildLuarocksPackage {
2174+mpack = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
2175+, fetchurl}:
2176+buildLuarocksPackage {
19582177 pname = "mpack";
1959− version = "1.0.8-0";
2178+ version = "1.0.9-0";
19602179 knownRockspec = (fetchurl {
1961− url = "https://luarocks.org/mpack-1.0.8-0.rockspec";
1962− sha256 = "0hhpamw2bydnfrild274faaan6v48918nhslnw3kvi9y36b4i5ha";
2180+ url = "https://luarocks.org/mpack-1.0.9-0.rockspec";
2181+ sha256 = "1v10kmw3qw559bbm142z40ib26bwvcyi64qjrk0vf8v6n1mx8wcn";
19632182 }).outPath;
19642183 src = fetchurl {
1965− url = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.8/libmpack-lua-1.0.8.tar.gz";
1966− sha256 = "1sf93ffx7a3y1waknc4994l2yrxilrlf3hcp2cj2cvxmpm5inszd";
2184+ url = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.9/libmpack-lua-1.0.9.tar.gz";
2185+ sha256 = "17lyjmnbychacwahqgs128nb00xky777g7zw5wf20vrzkiq7xl0g";
19672186 };
19682187
19692188
19702189 meta = {
1971− homepage = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.8/libmpack-lua-1.0.8.tar.gz";
2190+ homepage = "https://github.com/libmpack/libmpack-lua";
19722191 description = "Lua binding to libmpack";
19732192 license.fullName = "MIT";
19742193 };
1975−};
2194+}) {};
19762195
1977−nvim-client = buildLuarocksPackage {
2196+nvim-client = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
2197+, fetchurl, lua, mpack, luv, coxpcall
2198+}:
2199+buildLuarocksPackage {
19782200 pname = "nvim-client";
19792201 version = "0.2.2-1";
19802202
@@ -1983,7 +2205,7 @@ nvim-client = buildLuarocksPackage {
19832205 sha256 = "1h736im524lq0vwlpihv9b317jarpkf3j13a25xl5qq8y8asm8mr";
19842206 };
19852207
1986− disabled = (luaOlder "5.1");
2208+ disabled = with lua; (luaOlder "5.1");
19872209 propagatedBuildInputs = [ lua mpack luv coxpcall ];
19882210
19892211 meta = {
@@ -1991,9 +2213,12 @@ nvim-client = buildLuarocksPackage {
19912213 description = "Lua client to Nvim";
19922214 license.fullName = "Apache";
19932215 };
1994−};
2216+}) {};
19952217
1996−penlight = buildLuarocksPackage {
2218+penlight = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
2219+, fetchgit, lua, luafilesystem
2220+}:
2221+buildLuarocksPackage {
19972222 pname = "penlight";
19982223 version = "dev-1";
19992224
@@ -2010,10 +2235,8 @@ penlight = buildLuarocksPackage {
20102235}
20112236 '') ["date" "path"]) ;
20122237
2013− disabled = (luaOlder "5.1");
2238+ disabled = with lua; (luaOlder "5.1");
20142239 propagatedBuildInputs = [ lua luafilesystem ];
2015− checkInputs = [ busted busted ];
2016− doCheck = false;
20172240
20182241 meta = {
20192242 homepage = "https://lunarmodules.github.io/penlight";
@@ -2021,18 +2244,21 @@ penlight = buildLuarocksPackage {
20212244 maintainers = with lib.maintainers; [ alerque ];
20222245 license.fullName = "MIT/X11";
20232246 };
2024−};
2247+}) {};
20252248
2026−plenary-nvim = buildLuarocksPackage {
2249+plenary-nvim = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
2250+, fetchgit, lua, luassert
2251+}:
2252+buildLuarocksPackage {
20272253 pname = "plenary.nvim";
20282254 version = "scm-1";
20292255
20302256 src = fetchgit ( removeAttrs (builtins.fromJSON ''{
20312257 "url": "https://github.com/nvim-lua/plenary.nvim",
2032− "rev": "8c6cc07a68b65eb707be44598f0084647d495978",
2033− "date": "2021-09-26T16:13:25+02:00",
2034− "path": "/nix/store/j8hmr48blm4brq8rqv7b9m08vmalg8sp-plenary.nvim",
2035− "sha256": "05h5n7jj33y9vs6gc8hqlfd628j6i33s3c8fmfl6ahxwfygx2wpd",
2258+ "rev": "80bb2b9bb74bdca38a46480b6f2e15af990406e4",
2259+ "date": "2021-10-06T19:20:08+02:00",
2260+ "path": "/nix/store/mw4r562qxr7giy1n43iylp3qb8ch0jqs-plenary.nvim",
2261+ "sha256": "11akcpxcp4m997a2y76ajknnmsifac2hj4nq9i4a8b1j08bxinim",
20362262 "fetchLFS": false,
20372263 "fetchSubmodules": true,
20382264 "deepClone": false,
@@ -2040,7 +2266,7 @@ plenary-nvim = buildLuarocksPackage {
20402266}
20412267 '') ["date" "path"]) ;
20422268
2043− disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
2269+ disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4");
20442270 propagatedBuildInputs = [ lua luassert ];
20452271
20462272 meta = {
@@ -2048,9 +2274,12 @@ plenary-nvim = buildLuarocksPackage {
20482274 description = "lua functions you don't want to write ";
20492275 license.fullName = "MIT/X11";
20502276 };
2051−};
2277+}) {};
20522278
2053−rapidjson = buildLuarocksPackage {
2279+rapidjson = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
2280+, fetchgit, lua
2281+}:
2282+buildLuarocksPackage {
20542283 pname = "rapidjson";
20552284 version = "0.7.1-1";
20562285
@@ -2067,7 +2296,7 @@ rapidjson = buildLuarocksPackage {
20672296}
20682297 '') ["date" "path"]) ;
20692298
2070− disabled = (luaOlder "5.1");
2299+ disabled = with lua; (luaOlder "5.1");
20712300 propagatedBuildInputs = [ lua ];
20722301
20732302 meta = {
@@ -2075,9 +2304,12 @@ rapidjson = buildLuarocksPackage {
20752304 description = "Json module based on the very fast RapidJSON.";
20762305 license.fullName = "MIT";
20772306 };
2078−};
2307+}) {};
20792308
2080−readline = buildLuarocksPackage {
2309+readline = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
2310+, fetchurl, lua, luaposix
2311+}:
2312+buildLuarocksPackage {
20812313 pname = "readline";
20822314 version = "3.0-0";
20832315 knownRockspec = (fetchurl {
@@ -2089,7 +2321,7 @@ readline = buildLuarocksPackage {
20892321 sha256 = "1rr2b7q8w3i4bm1i634sd6kzhw6v1fpnh53mj09af6xdq1rfhr5n";
20902322 };
20912323
2092− disabled = (luaOlder "5.1") || (luaAtLeast "5.5");
2324+ disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5");
20932325 propagatedBuildInputs = [ lua luaposix ];
20942326
20952327 meta = {
@@ -2097,9 +2329,12 @@ readline = buildLuarocksPackage {
20972329 description = "Interface to the readline library";
20982330 license.fullName = "MIT/X11";
20992331 };
2100−};
2332+}) {};
21012333
2102−say = buildLuarocksPackage {
2334+say = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
2335+, fetchurl, lua
2336+}:
2337+buildLuarocksPackage {
21032338 pname = "say";
21042339 version = "1.3-1";
21052340
@@ -2108,7 +2343,7 @@ say = buildLuarocksPackage {
21082343 sha256 = "1jh76mxq9dcmv7kps2spwcc6895jmj2sf04i4y9idaxlicvwvs13";
21092344 };
21102345
2111− disabled = (luaOlder "5.1");
2346+ disabled = with lua; (luaOlder "5.1");
21122347 propagatedBuildInputs = [ lua ];
21132348
21142349 meta = {
@@ -2116,9 +2351,12 @@ say = buildLuarocksPackage {
21162351 description = "Lua String Hashing/Indexing Library";
21172352 license.fullName = "MIT <http://opensource.org/licenses/MIT>";
21182353 };
2119−};
2354+}) {};
21202355
2121−std-_debug = buildLuarocksPackage {
2356+std-_debug = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
2357+, fetchgit, lua
2358+}:
2359+buildLuarocksPackage {
21222360 pname = "std._debug";
21232361 version = "git-1";
21242362
@@ -2135,7 +2373,7 @@ std-_debug = buildLuarocksPackage {
21352373}
21362374 '') ["date" "path"]) ;
21372375
2138− disabled = (luaOlder "5.1") || (luaAtLeast "5.5");
2376+ disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5");
21392377 propagatedBuildInputs = [ lua ];
21402378
21412379 meta = {
@@ -2143,9 +2381,12 @@ std-_debug = buildLuarocksPackage {
21432381 description = "Debug Hints Library";
21442382 license.fullName = "MIT/X11";
21452383 };
2146−};
2384+}) {};
21472385
2148−std-normalize = buildLuarocksPackage {
2386+std-normalize = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
2387+, fetchgit, lua, std-_debug
2388+}:
2389+buildLuarocksPackage {
21492390 pname = "std.normalize";
21502391 version = "git-1";
21512392
@@ -2162,7 +2403,7 @@ std-normalize = buildLuarocksPackage {
21622403}
21632404 '') ["date" "path"]) ;
21642405
2165− disabled = (luaOlder "5.1") || (luaAtLeast "5.5");
2406+ disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5");
21662407 propagatedBuildInputs = [ lua std-_debug ];
21672408
21682409 meta = {
@@ -2170,9 +2411,12 @@ std-normalize = buildLuarocksPackage {
21702411 description = "Normalized Lua Functions";
21712412 license.fullName = "MIT/X11";
21722413 };
2173−};
2414+}) {};
21742415
2175−stdlib = buildLuarocksPackage {
2416+stdlib = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
2417+, fetchurl, lua
2418+}:
2419+buildLuarocksPackage {
21762420 pname = "stdlib";
21772421 version = "41.2.2-1";
21782422 knownRockspec = (fetchurl {
@@ -2184,7 +2428,7 @@ stdlib = buildLuarocksPackage {
21842428 sha256 = "0is8i8lk4qq4afnan0vj1bwr8brialyrva7cjy43alzgwdphwynx";
21852429 };
21862430
2187− disabled = (luaOlder "5.1") || (luaAtLeast "5.5");
2431+ disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5");
21882432 propagatedBuildInputs = [ lua ];
21892433
21902434 meta = {
@@ -2193,9 +2437,12 @@ stdlib = buildLuarocksPackage {
21932437 maintainers = with lib.maintainers; [ vyp ];
21942438 license.fullName = "MIT/X11";
21952439 };
2196−};
2440+}) {};
21972441
2198−vstruct = buildLuarocksPackage {
2442+vstruct = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
2443+, fetchgit, lua
2444+}:
2445+buildLuarocksPackage {
21992446 pname = "vstruct";
22002447 version = "2.1.1-1";
22012448
@@ -2212,14 +2459,14 @@ vstruct = buildLuarocksPackage {
22122459}
22132460 '') ["date" "path"]) ;
22142461
2215− disabled = (luaOlder "5.1");
2462+ disabled = with lua; (luaOlder "5.1");
22162463 propagatedBuildInputs = [ lua ];
22172464
22182465 meta = {
22192466 homepage = "https://github.com/ToxicFrog/vstruct";
22202467 description = "Lua library to manipulate binary data";
22212468 };
2222−};
2469+}) {};
22232470
22242471
22252472}
pkgs/development/lua-modules/lib.nix+12
@@ -5,8 +5,20 @@ let
55 in unique ([lua] ++ modules ++ concatLists (catAttrs "requiredLuaModules" modules));
66 # Check whether a derivation provides a lua module.
77 hasLuaModule = drv: drv ? luaModule;
8+
9+
10+ /*
11+ Use this to override the arguments passed to buildLuarocksPackage
12+ */
13+ overrideLuarocks = drv: f: (drv.override (args: args // {
14+ buildLuarocksPackage = drv: (args.buildLuarocksPackage drv).override f;
15+ })) // {
16+ overrideScope = scope: overrideLuarocks (drv.overrideScope scope) f;
17+ };
18+
819in
920rec {
21+ inherit overrideLuarocks;
1022 inherit hasLuaModule requiredLuaModules;
1123
1224 luaPathList = [
pkgs/development/lua-modules/overrides.nix+56−58
@@ -1,11 +1,11 @@
1−{ pkgs, ... }:
2−self: super:
3−with super;
1+{ pkgs }:
2+final: prev:
3+with prev;
44{
55 ##########################################3
66 #### manual fixes for generated packages
77 ##########################################3
8− bit32 = super.bit32.override({
8+ bit32 = prev.bit32.overrideAttrs(oa: {
99 # Small patch in order to no longer redefine a Lua 5.2 function that Luajit
1010 # 2.1 also provides, see https://github.com/LuaJIT/LuaJIT/issues/325 for
1111 # more
@@ -14,7 +14,7 @@ with super;
1414 ];
1515 });
1616
17− busted = super.busted.override({
17+ busted = prev.busted.overrideAttrs(oa: {
1818 postConfigure = ''
1919 substituteInPlace ''${rockspecFilename} \
2020 --replace "'lua_cliargs = 3.0-1'," "'lua_cliargs >= 3.0-1',"
@@ -25,14 +25,7 @@ with super;
2525 '';
2626 });
2727
28− cqueues = super.cqueues.override(rec {
29− # Parse out a version number without the Lua version inserted
30− version = with pkgs.lib; let
31− version' = super.cqueues.version;
32− rel = splitVersion version';
33− date = head rel;
34− rev = last (splitString "-" (last rel));
35− in "${date}-${rev}";
28+ cqueues = (prev.lib.overrideLuarocks prev.cqueues (drv: {
3629 nativeBuildInputs = [
3730 pkgs.gnum4
3831 ];
@@ -41,9 +34,17 @@ with super;
4134 { name = "OPENSSL"; dep = pkgs.openssl; }
4235 ];
4336 disabled = luaOlder "5.1" || luaAtLeast "5.4";
37+ })).overrideAttrs(oa: rec {
38+ # Parse out a version number without the Lua version inserted
39+ version = with pkgs.lib; let
40+ version' = prev.cqueues.version;
41+ rel = splitVersion version';
42+ date = head rel;
43+ rev = last (splitString "-" (last rel));
44+ in "${date}-${rev}";
4445 # Upstream rockspec is pointlessly broken into separate rockspecs, per Lua
4546 # version, which doesn't work well for us, so modify it
46− postConfigure = let inherit (super.cqueues) pname; in ''
47+ postConfigure = let inherit (prev.cqueues) pname; in ''
4748 # 'all' target auto-detects correct Lua version, which is fine for us as
4849 # we only have the right one available :)
4950 sed -Ei ''${rockspecFilename} \
@@ -56,13 +57,13 @@ with super;
5657 '';
5758 });
5859
59− cyrussasl = super.cyrussasl.override({
60+ cyrussasl = prev.lib.overrideLuarocks prev.cyrussasl (drv: {
6061 externalDeps = [
6162 { name = "LIBSASL"; dep = pkgs.cyrus_sasl; }
6263 ];
6364 });
6465
65− http = super.http.override({
66+ http = prev.http.overrideAttrs(oa: {
6667 patches = [
6768 (pkgs.fetchpatch {
6869 name = "invalid-state-progression.patch";
@@ -76,7 +77,7 @@ with super;
7677 */
7778 });
7879
79− ldbus = super.ldbus.override({
80+ ldbus = prev.lib.overrideLuarocks prev.ldbus (drv: {
8081 extraVariables = {
8182 DBUS_DIR="${pkgs.dbus.lib}";
8283 DBUS_ARCH_INCDIR="${pkgs.dbus.lib}/lib/dbus-1.0/include";
@@ -87,7 +88,7 @@ with super;
8788 ];
8889 });
8990
90− ljsyscall = super.ljsyscall.override(rec {
91+ ljsyscall = prev.ljsyscall.overrideAttrs(oa: rec {
9192 version = "unstable-20180515";
9293 # package hasn't seen any release for a long time
9394 src = pkgs.fetchFromGitHub {
@@ -106,7 +107,7 @@ with super;
106107 propagatedBuildInputs = with pkgs.lib; optional (!isLuaJIT) luaffi;
107108 });
108109
109− lgi = super.lgi.override({
110+ lgi = prev.lib.overrideLuarocks prev.lgi (drv: {
110111 nativeBuildInputs = [
111112 pkgs.pkg-config
112113 ];
@@ -128,31 +129,31 @@ with super;
128129 '';
129130 });
130131
131− lrexlib-gnu = super.lrexlib-gnu.override({
132+ lrexlib-gnu = prev.lib.overrideLuarocks prev.lrexlib-gnu (drv: {
132133 buildInputs = [
133134 pkgs.gnulib
134135 ];
135136 });
136137
137− lrexlib-pcre = super.lrexlib-pcre.override({
138+ lrexlib-pcre = prev.lib.overrideLuarocks prev.lrexlib-pcre (drv: {
138139 externalDeps = [
139140 { name = "PCRE"; dep = pkgs.pcre; }
140141 ];
141142 });
142143
143− lrexlib-posix = super.lrexlib-posix.override({
144+ lrexlib-posix = prev.lib.overrideLuarocks prev.lrexlib-posix (drv: {
144145 buildInputs = [
145146 pkgs.glibc.dev
146147 ];
147148 });
148149
149− lua-iconv = super.lua-iconv.override({
150+ lua-iconv = prev.lib.overrideLuarocks prev.lua-iconv (drv: {
150151 buildInputs = [
151152 pkgs.libiconv
152153 ];
153154 });
154155
155− lua-lsp = super.lua-lsp.override({
156+ lua-lsp = prev.lua-lsp.overrideAttrs(oa: {
156157 # until Alloyed/lua-lsp#28
157158 postConfigure = ''
158159 substituteInPlace ''${rockspecFilename} \
@@ -160,14 +161,14 @@ with super;
160161 '';
161162 });
162163
163− lua-zlib = super.lua-zlib.override({
164+ lua-zlib = prev.lib.overrideLuarocks prev.lua-zlib (drv: {
164165 buildInputs = [
165166 pkgs.zlib.dev
166167 ];
167168 disabled = luaOlder "5.1" || luaAtLeast "5.4";
168169 });
169170
170− luadbi-mysql = super.luadbi-mysql.override({
171+ luadbi-mysql = prev.lib.overrideLuarocks prev.luadbi-mysql (drv: {
171172 extraVariables = {
172173 # Can't just be /include and /lib, unfortunately needs the trailing 'mysql'
173174 MYSQL_INCDIR="${pkgs.libmysqlclient.dev}/include/mysql";
@@ -179,19 +180,19 @@ with super;
179180 ];
180181 });
181182
182− luadbi-postgresql = super.luadbi-postgresql.override({
183+ luadbi-postgresql = prev.lib.overrideLuarocks prev.luadbi-postgresql (drv: {
183184 buildInputs = [
184185 pkgs.postgresql
185186 ];
186187 });
187188
188− luadbi-sqlite3 = super.luadbi-sqlite3.override({
189+ luadbi-sqlite3 = prev.lib.overrideLuarocks prev.luadbi-sqlite3 (drv: {
189190 externalDeps = [
190191 { name = "SQLITE"; dep = pkgs.sqlite; }
191192 ];
192193 });
193194
194− luaevent = super.luaevent.override({
195+ luaevent = prev.lib.overrideLuarocks prev.luaevent (drv: {
195196 propagatedBuildInputs = [
196197 luasocket
197198 ];
@@ -201,7 +202,7 @@ with super;
201202 disabled = luaOlder "5.1" || luaAtLeast "5.4";
202203 });
203204
204− luaexpat = super.luaexpat.override({
205+ luaexpat = prev.lib.overrideLuarocks prev.luaexpat (drv: {
205206 externalDeps = [
206207 { name = "EXPAT"; dep = pkgs.expat; }
207208 ];
@@ -212,59 +213,57 @@ with super;
212213
213214 # TODO Somehow automatically amend buildInputs for things that need luaffi
214215 # but are in luajitPackages?
215− luaffi = super.luaffi.override({
216+ luaffi = prev.lib.overrideLuarocks prev.luaffi (drv: {
216217 # The packaged .src.rock version is pretty old, and doesn't work with Lua 5.3
217218 src = pkgs.fetchFromGitHub {
218219 owner = "facebook"; repo = "luaffifb";
219220 rev = "532c757e51c86f546a85730b71c9fef15ffa633d";
220221 sha256 = "1nwx6sh56zfq99rcs7sph0296jf6a9z72mxknn0ysw9fd7m1r8ig";
221222 };
222− knownRockspec = with super.luaffi; "${pname}-${version}.rockspec";
223+ knownRockspec = with prev.luaffi; "${pname}-${version}.rockspec";
223224 disabled = luaOlder "5.1" || luaAtLeast "5.4" || isLuaJIT;
224225 });
225226
226− luaossl = super.luaossl.override({
227+ luaossl = prev.lib.overrideLuarocks prev.luaossl (drv: {
227228 externalDeps = [
228229 { name = "CRYPTO"; dep = pkgs.openssl; }
229230 { name = "OPENSSL"; dep = pkgs.openssl; }
230231 ];
231232 });
232233
233− luasec = super.luasec.override({
234+ luasec = prev.lib.overrideLuarocks prev.luasec (drv: {
234235 externalDeps = [
235236 { name = "OPENSSL"; dep = pkgs.openssl; }
236237 ];
237238 });
238239
239− luasql-sqlite3 = super.luasql-sqlite3.override({
240+ luasql-sqlite3 = prev.lib.overrideLuarocks prev.luasql-sqlite3 (drv: {
240241 externalDeps = [
241242 { name = "SQLITE"; dep = pkgs.sqlite; }
242243 ];
243244 });
244245
245− luasystem = super.luasystem.override({
246− buildInputs = pkgs.lib.optionals pkgs.stdenv.isLinux [
247− pkgs.glibc
248− ];
249− });
246+ luasystem = prev.lib.overrideLuarocks prev.luasystem (drv: { buildInputs = [ pkgs.glibc.out ]; });
250247
251− luazip = super.luazip.override({
248+ luazip = prev.lib.overrideLuarocks prev.luazip (drv: {
252249 buildInputs = [
253250 pkgs.zziplib
254251 ];
255252 });
256253
257− lua-yajl = super.lua-yajl.override({
254+ lua-yajl = prev.lib.overrideLuarocks prev.lua-yajl (drv: {
258255 buildInputs = [
259256 pkgs.yajl
260257 ];
261258 });
262259
263− luuid = super.luuid.override(old: {
260+ luuid = (prev.lib.overrideLuarocks prev.luuid (drv: {
264261 externalDeps = [
265262 { name = "LIBUUID"; dep = pkgs.libuuid; }
266263 ];
267− meta = old.meta // {
264+ disabled = luaOlder "5.1" || (luaAtLeast "5.4");
265+ })).overrideAttrs(oa: {
266+ meta = oa.meta // {
268267 platforms = pkgs.lib.platforms.linux;
269268 };
270269 # Trivial patch to make it work in both 5.1 and 5.2. Basically just the
@@ -276,13 +275,12 @@ with super;
276275 patches = [
277276 ./luuid.patch
278277 ];
279− postConfigure = let inherit (super.luuid) version pname; in ''
278+ postConfigure = let inherit (prev.luuid) version pname; in ''
280279 sed -Ei ''${rockspecFilename} -e 's|lua >= 5.2|lua >= 5.1,|'
281280 '';
282− disabled = luaOlder "5.1" || (luaAtLeast "5.4");
283281 });
284282
285− luv = super.luv.override({
283+ luv = prev.lib.overrideLuarocks prev.luv (drv: {
286284 # Use system libuv instead of building local and statically linking
287285 # This is a hacky way to specify -DWITH_SHARED_LIBUV=ON which
288286 # is not possible with luarocks and the current luv rockspec
@@ -296,8 +294,8 @@ with super;
296294 buildInputs = [ pkgs.libuv ];
297295
298296 passthru = {
299− libluv = self.luv.override ({
300− preBuild = self.luv.preBuild + ''
297+ libluv = final.luv.overrideAttrs (oa: {
298+ preBuild = final.luv.preBuild + ''
301299 sed -i 's,\(option(BUILD_MODULE.*\)ON,\1OFF,' CMakeLists.txt
302300 sed -i 's,\(option(BUILD_SHARED_LIBS.*\)OFF,\1ON,' CMakeLists.txt
303301 sed -i 's,${"\${.*INSTALL_INC_DIR}"},${placeholder "out"}/include/luv,' CMakeLists.txt
@@ -312,32 +310,32 @@ with super;
312310 };
313311 });
314312
315− lyaml = super.lyaml.override({
313+ lyaml = prev.lib.overrideLuarocks prev.lyaml (oa: {
316314 buildInputs = [
317315 pkgs.libyaml
318316 ];
319317 });
320318
321− mpack = super.mpack.override({
319+ mpack = prev.lib.overrideLuarocks prev.mpack (drv: {
322320 buildInputs = [ pkgs.libmpack ];
323321 # the rockspec doesn't use the makefile so you may need to export more flags
324322 USE_SYSTEM_LUA = "yes";
325323 USE_SYSTEM_MPACK = "yes";
326324 });
327325
328− rapidjson = super.rapidjson.override({
326+ rapidjson = prev.rapidjson.overrideAttrs(oa: {
329327 preBuild = ''
330328 sed -i '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt
331329 sed -i '/set(CMAKE_C_FLAGS/d' CMakeLists.txt
332330 '';
333331 });
334332
335− readline = (super.readline.override ({
333+ readline = (prev.lib.overrideLuarocks prev.readline (drv: {
336334 unpackCmd = ''
337335 unzip "$curSrc"
338336 tar xf *.tar.gz
339337 '';
340− propagatedBuildInputs = super.readline.propagatedBuildInputs ++ [ pkgs.readline ];
338+ propagatedBuildInputs = prev.readline.propagatedBuildInputs ++ [ pkgs.readline.out ];
341339 extraVariables = rec {
342340 READLINE_INCDIR = "${pkgs.readline.dev}/include";
343341 HISTORY_INCDIR = READLINE_INCDIR;
@@ -349,14 +347,14 @@ with super;
349347 '';
350348 });
351349
352− std-_debug = super.std-_debug.overrideAttrs(oa: {
350+ std-_debug = prev.std-_debug.overrideAttrs(oa: {
353351 # run make to generate lib/std/_debug/version.lua
354352 preConfigure = ''
355353 make all
356354 '';
357355 });
358356
359− std-normalize = super.std-normalize.overrideAttrs(oa: {
357+ std-normalize = prev.std-normalize.overrideAttrs(oa: {
360358 # run make to generate lib/std/_debug/version.lua
361359 preConfigure = ''
362360 make all
@@ -365,10 +363,10 @@ with super;
365363
366364 # TODO just while testing, remove afterwards
367365 # toVimPlugin should do it instead
368− gitsigns-nvim = super.gitsigns-nvim.overrideAttrs(oa: {
366+ gitsigns-nvim = prev.gitsigns-nvim.overrideAttrs(oa: {
369367 nativeBuildInputs = oa.nativeBuildInputs or [] ++ [ pkgs.vimUtils.vimGenDocHook ];
370368 });
371369
372370 # aliases
373− cjson = super.lua-cjson;
371+ cjson = prev.lua-cjson;
374372}
pkgs/development/tools/misc/luarocks/luarocks-nix.nix+2−2
@@ -5,8 +5,8 @@ luarocks.overrideAttrs(old: {
55 src = fetchFromGitHub {
66 owner = "nix-community";
77 repo = "luarocks-nix";
8− rev = "test-speedup";
9− sha256 = "sha256-WfzLSpIp0V7Ib4sjYvoJHF+/vHaieccvfVAr5W47QsQ=";
8+ rev = "standalone";
9+ sha256 = "sha256-53Zi+GTayO9EQTCIVrzPeRRHeIkHLqy0mHyBDzbcQQk=";
1010 };
1111 patches = [];
1212