Merge branch 'master' into staging-next

; Conflicts: ; pkgs/development/lua-modules/generated-packages.nix ; pkgs/development/lua-modules/overrides.nix
2023-12-31 02:31:32 +01:00
parent f50aae4fb1 55b9aa64c3
commit 80020c7db4
162 changed files with 6794 additions and 941 deletions
@@ -60,8 +60,8 @@ let
    passthru = lua.passthru // {
      interpreter = "${env}/bin/lua";
      inherit lua;
-      luaPath = lua.pkgs.lib.genLuaPathAbsStr env;
-      luaCpath = lua.pkgs.lib.genLuaCPathAbsStr env;
+      luaPath = lua.pkgs.luaLib.genLuaPathAbsStr env;
+      luaCpath = lua.pkgs.luaLib.genLuaCPathAbsStr env;
      env = stdenv.mkDerivation {
        name = "interactive-${lua.name}-environment";
        nativeBuildInputs = [ env ];