From 143951127898fc9dd6ca968a28de4801c6ace1d5 Mon Sep 17 00:00:00 2001 From: teto <886074+teto@users.noreply.github.com> Date: Sun, 25 Jan 2026 14:11:24 +0100 Subject: [PATCH] luaPackages.tree-sitter-orgmode: fix build with strictDeps There is a patch in staging enabling strictDeps for lua packages. I noticed tree-sitter-orgmode failed to patch on recent master with strictDeps so this is a preemptive fix. --- maintainers/scripts/luarocks-packages.csv | 2 +- pkgs/development/lua-modules/overrides.nix | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 24fd936a66ac..877e97fd2aed 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -158,7 +158,7 @@ tl,,,,,,mephistophiles toml-edit,,,,,5.1,mrcjkb tree-sitter-http,,,,0.0.33-1,, tree-sitter-norg,,,,,5.1,mrcjkb -tree-sitter-orgmode,,,,,, +tree-sitter-orgmode,,,,,5.1, vstruct,,,,,, vusted,,,,,, xml2lua,,,,,,teto diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index ffb76d6fffbc..3c3c5ef0677c 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -1173,9 +1173,12 @@ in ++ [ lua.pkgs.luarocks-build-treesitter-parser-cpp ]; + + meta.broken = lua.luaversion != "5.1"; }); tree-sitter-orgmode = prev.tree-sitter-orgmode.overrideAttrs (old: { + strictDeps = true; # can be removed after february 2026 propagatedBuildInputs = let # HACK: luarocks-nix puts rockspec build dependencies in the nativeBuildInputs, @@ -1185,11 +1188,14 @@ in old.propagatedBuildInputs ++ [ lua.pkgs.luarocks-build-treesitter-parser - tree-sitter ]; nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ writableTmpDirAsHomeHook + tree-sitter ]; + + # should be fixed upstream + meta.broken = lua.luaversion != "5.1"; }); vstruct = prev.vstruct.overrideAttrs (_: {