Skip to content

Commit 35a219f

Browse files
authored
vimPlugins.orgmode: fix tree-sitter-org error (#387235)
2 parents e7de44d + 91943aa commit 35a219f

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

pkgs/applications/editors/vim/plugins/overrides.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2631,10 +2631,6 @@ in
26312631
];
26322632
};
26332633

2634-
orgmode = super.orgmode.overrideAttrs {
2635-
dependencies = with self; [ (nvim-treesitter.withPlugins (p: [ p.org ])) ];
2636-
};
2637-
26382634
otter-nvim = super.otter-nvim.overrideAttrs {
26392635
dependencies = [ self.nvim-lspconfig ];
26402636
};

pkgs/development/lua-modules/overrides.nix

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1114,15 +1114,13 @@ in
11141114
orgmode = prev.orgmode.overrideAttrs (oa: {
11151115
# Patch in tree-sitter-orgmode dependency
11161116
postPatch = ''
1117-
substituteInPlace lua/orgmode/utils/treesitter/install.lua \
1117+
substituteInPlace lua/orgmode/utils/treesitter/install.lua lua/orgmode/health.lua \
11181118
--replace-fail \
11191119
"pcall(vim.treesitter.language.add, 'org')" \
11201120
"pcall(function() vim.treesitter.language.add('org', { path = '${final.tree-sitter-orgmode}/lib/lua/${final.tree-sitter-orgmode.lua.luaversion}/parser/org.so'}) end)"
11211121
1122-
substituteInPlace lua/orgmode/health.lua \
1123-
--replace-fail \
1124-
"pcall(vim.treesitter.language.add, 'org')" \
1125-
"pcall(function() vim.treesitter.language.add('org', { path = '${final.tree-sitter-orgmode}/lib/lua/${final.tree-sitter-orgmode.lua.luaversion}/parser/org.so'}) end)"
1122+
substituteInPlace lua/orgmode/utils/treesitter/install.lua \
1123+
--replace-fail "if M.outdated() then" "if false then"
11261124
'';
11271125
});
11281126

0 commit comments

Comments
 (0)