From 6a761363067bd8c794b1fe738dafdc71da064126 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 26 Feb 2026 23:29:05 -0600 Subject: [PATCH 1/4] build-luarocks-package: include nativeBuildInputs Signed-off-by: Austin Horstman --- .../development/interpreters/lua-5/build-luarocks-package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix index d17547eff73a..bc79b674b472 100644 --- a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix +++ b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix @@ -27,6 +27,9 @@ # These are added to nativeBuildInputs when doCheck = true. nativeCheckInputs ? [ ], + # Rockspec `build_dependencies` generated by `luarocks nix`). + nativeBuildInputs ? [ ], + # propagate build dependencies so in case we have A -> B -> C, # C can import package A propagated by B propagatedBuildInputs ? [ ], @@ -101,6 +104,7 @@ let wrapLua luarocks_bootstrap ] + ++ nativeBuildInputs ++ lib.optionals self.doCheck self.nativeCheckInputs; inherit From 60e747ab918680ec7014962fb75b782575771683 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 26 Feb 2026 23:31:13 -0600 Subject: [PATCH 2/4] luaPackages: remove unneeded build inputs hack Signed-off-by: Austin Horstman --- pkgs/development/lua-modules/overrides.nix | 36 +--------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index bdbe2f6a4545..b604494bac87 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -1104,51 +1104,17 @@ in }); tree-sitter-http = prev.tree-sitter-http.overrideAttrs (old: { - strictDeps = false; - propagatedBuildInputs = - let - # HACK: luarocks-nix puts rockspec build dependencies in the nativeBuildInputs, - # but that doesn't seem to work - lua = lib.head old.propagatedBuildInputs; - in - old.propagatedBuildInputs - ++ [ - lua.pkgs.luarocks-build-treesitter-parser - tree-sitter - ]; - nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ + tree-sitter writableTmpDirAsHomeHook ]; }); tree-sitter-norg = prev.tree-sitter-norg.overrideAttrs (old: { - propagatedBuildInputs = - let - # HACK: luarocks-nix puts rockspec build dependencies in the nativeBuildInputs, - # but that doesn't seem to work - lua = lib.head old.propagatedBuildInputs; - in - old.propagatedBuildInputs - ++ [ - lua.pkgs.luarocks-build-treesitter-parser-cpp - ]; - meta.broken = lua.luaversion != "5.1"; }); tree-sitter-orgmode = prev.tree-sitter-orgmode.overrideAttrs (old: { - strictDeps = false; - propagatedBuildInputs = - let - # HACK: luarocks-nix puts rockspec build dependencies in the nativeBuildInputs, - # but that doesn't seem to work - lua = lib.head old.propagatedBuildInputs; - in - old.propagatedBuildInputs - ++ [ - lua.pkgs.luarocks-build-treesitter-parser - ]; nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ writableTmpDirAsHomeHook tree-sitter From 8a321ae984a3cc9aba119f2a0f91a6cf7c4a5d2a Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 27 Feb 2026 11:49:53 -0600 Subject: [PATCH 3/4] lua55Packages.lua-rtoml: mark broken Signed-off-by: Austin Horstman --- pkgs/development/lua-modules/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index b604494bac87..98d4e76f626f 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -452,7 +452,7 @@ in # ld: symbol(s) not found for architecture arm64 # clang-16: error: linker command failed with exit code 1 (use -v to see invocation) - meta.broken = stdenv.hostPlatform.isDarwin; + meta.broken = stdenv.hostPlatform.isDarwin || luaAtLeast "5.5"; }); lua-subprocess = prev.lua-subprocess.overrideAttrs { From f585163fb98f2f37becb8b0fb80d9e7443245990 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 27 Feb 2026 11:50:12 -0600 Subject: [PATCH 4/4] lua55Packages.tiktoken_core: mark broken Signed-off-by: Austin Horstman --- pkgs/development/lua-modules/overrides.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 98d4e76f626f..36bcbc7742d8 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -1075,6 +1075,10 @@ in cargo rustPlatform.cargoSetupHook ]; + + meta = old.meta // { + broken = luaAtLeast "5.5"; + }; }); tl = prev.tl.overrideAttrs (old: {