From 25f8a3f2763ac89f5124176627b22181d883a053 Mon Sep 17 00:00:00 2001 From: Mykola Orliuk Date: Sun, 23 Apr 2023 02:43:37 +0200 Subject: lua.lib: use toLua in generateLuarocksConfig --- pkgs/development/lua-modules/lib.nix | 55 ++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 31 deletions(-) (limited to 'pkgs/development/lua-modules') diff --git a/pkgs/development/lua-modules/lib.nix b/pkgs/development/lua-modules/lib.nix index 5079a4b25405c..467e73c5e7e7c 100644 --- a/pkgs/development/lua-modules/lib.nix +++ b/pkgs/development/lua-modules/lib.nix @@ -1,5 +1,6 @@ { pkgs, lib, lua }: let + inherit (lib.generators) toLua; requiredLuaModules = drvs: with lib; let modules = filter hasLuaModule drvs; in unique ([lua] ++ modules ++ concatLists (catAttrs "requiredLuaModules" modules)); @@ -89,58 +90,50 @@ rec { , rocksSubdir }: let rocksTrees = lib.imap0 - (i: dep: "{ name = [[dep-${toString i}]], root = '${dep}', rocks_dir = '${dep}/${dep.rocksSubdir}' }") + (i: dep: { name = "dep-${toString i}"; root = "${dep}"; rocks_dir = "${dep}/${dep.rocksSubdir}"; }) requiredLuaRocks; # Explicitly point luarocks to the relevant locations for multiple-output # derivations that are external dependencies, to work around an issue it has # (https://github.com/luarocks/luarocks/issues/766) - depVariables = lib.concatMap ({name, dep}: [ - "${name}_INCDIR='${lib.getDev dep}/include';" - "${name}_LIBDIR='${lib.getLib dep}/lib';" - "${name}_BINDIR='${lib.getBin dep}/bin';" - ]) externalDeps'; + depVariables = zipAttrsWithLast (lib.lists.map ({name, dep}: { + "${name}_INCDIR" = "${lib.getDev dep}/include"; + "${name}_LIBDIR" = "${lib.getLib dep}/lib"; + "${name}_BINDIR" = "${lib.getBin dep}/bin"; + }) externalDeps'); + zipAttrsWithLast = lib.attrsets.zipAttrsWith (name: lib.lists.last); # example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ] externalDeps' = lib.filter (dep: !lib.isDerivation dep) externalDeps; externalDepsDirs = map - (x: "'${builtins.toString x}'") + (x: builtins.toString x) (lib.filter (lib.isDerivation) externalDeps); - - extraVariablesStr = lib.concatStringsSep "\n " - (lib.mapAttrsToList (k: v: "${k}='${v}';") extraVariables); in '' local_cache = "" -- To prevent collisions when creating environments, we install the rock -- files into per-package subdirectories - rocks_subdir = '${rocksSubdir}' + rocks_subdir = ${toLua {} rocksSubdir} -- first tree is the default target where new rocks are installed, -- any other trees in the list are treated as additional sources of installed rocks for matching dependencies. - rocks_trees = { - {name = "current", root = '${placeholder "out"}', rocks_dir = "current" }, - ${lib.concatStringsSep "\n, " rocksTrees} - } + rocks_trees = ${toLua {} ( + [{name = "current"; root = "${placeholder "out"}"; rocks_dir = "current"; }] ++ + rocksTrees + )} '' + lib.optionalString lua.pkgs.isLuaJIT '' -- Luajit provides some additional functionality built-in; this exposes -- that to luarock's dependency system - rocks_provided = { - jit='${lua.luaversion}-1'; - ffi='${lua.luaversion}-1'; - luaffi='${lua.luaversion}-1'; - bit='${lua.luaversion}-1'; - } + rocks_provided = ${toLua {} { + jit = "${lua.luaversion}-1"; + ffi = "${lua.luaversion}-1"; + luaffi = "${lua.luaversion}-1"; + bit = "${lua.luaversion}-1"; + }} '' + '' -- For single-output external dependencies - external_deps_dirs = { - ${lib.concatStringsSep "\n, " externalDepsDirs} - } - variables = { - -- Some needed machinery to handle multiple-output external dependencies, - -- as per https://github.com/luarocks/luarocks/issues/766 - ${lib.optionalString (lib.length depVariables > 0) '' - ${lib.concatStringsSep "\n " depVariables}''} - ${extraVariablesStr} - } + external_deps_dirs = ${toLua {} externalDepsDirs} + -- Some needed machinery to handle multiple-output external dependencies, + -- as per https://github.com/luarocks/luarocks/issues/766 + variables = ${toLua {} (depVariables // extraVariables)} ''; } -- cgit 1.4.1 From 82e9b3f35800dd0e838b78727b95138d72203dd3 Mon Sep 17 00:00:00 2001 From: Mykola Orliuk Date: Sat, 29 Apr 2023 18:37:42 +0200 Subject: lua.lib: lift toLua to top in generateLuarocksConfig With asBindings option of toLua we can generate whole block of global variables assignments. --- pkgs/development/lua-modules/lib.nix | 42 ++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'pkgs/development/lua-modules') diff --git a/pkgs/development/lua-modules/lib.nix b/pkgs/development/lua-modules/lib.nix index 467e73c5e7e7c..64a40fa79602b 100644 --- a/pkgs/development/lua-modules/lib.nix +++ b/pkgs/development/lua-modules/lib.nix @@ -109,31 +109,31 @@ rec { externalDepsDirs = map (x: builtins.toString x) (lib.filter (lib.isDerivation) externalDeps); - in '' - local_cache = "" - -- To prevent collisions when creating environments, we install the rock - -- files into per-package subdirectories - rocks_subdir = ${toLua {} rocksSubdir} - -- first tree is the default target where new rocks are installed, - -- any other trees in the list are treated as additional sources of installed rocks for matching dependencies. - rocks_trees = ${toLua {} ( + in toLua { asBindings = true; } ({ + local_cache = ""; + # To prevent collisions when creating environments, we install the rock + # files into per-package subdirectories + rocks_subdir = rocksSubdir; + # first tree is the default target where new rocks are installed, + # any other trees in the list are treated as additional sources of installed rocks for matching dependencies. + rocks_trees = ( [{name = "current"; root = "${placeholder "out"}"; rocks_dir = "current"; }] ++ rocksTrees - )} - '' + lib.optionalString lua.pkgs.isLuaJIT '' - -- Luajit provides some additional functionality built-in; this exposes - -- that to luarock's dependency system - rocks_provided = ${toLua {} { + ); + } // lib.optionalAttrs lua.pkgs.isLuaJIT { + # Luajit provides some additional functionality built-in; this exposes + # that to luarock's dependency system + rocks_provided = { jit = "${lua.luaversion}-1"; ffi = "${lua.luaversion}-1"; luaffi = "${lua.luaversion}-1"; bit = "${lua.luaversion}-1"; - }} - '' + '' - -- For single-output external dependencies - external_deps_dirs = ${toLua {} externalDepsDirs} - -- Some needed machinery to handle multiple-output external dependencies, - -- as per https://github.com/luarocks/luarocks/issues/766 - variables = ${toLua {} (depVariables // extraVariables)} - ''; + }; + } // { + # For single-output external dependencies + external_deps_dirs = externalDepsDirs; + # Some needed machinery to handle multiple-output external dependencies, + # as per https://github.com/luarocks/luarocks/issues/766 + variables = (depVariables // extraVariables); + }); } -- cgit 1.4.1