about summary refs log tree commit diff
path: root/pkgs/by-name/ne/neovim-unwrapped/package.nix
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2024-05-18 00:12:56 +0000
committerGitHub <noreply@github.com>2024-05-18 00:12:56 +0000
commit154bc6bfe607be732374fc57554b165e692b77a8 (patch)
tree60ad3d3927c23db46d7c904b3293906d56ef1f7d /pkgs/by-name/ne/neovim-unwrapped/package.nix
parent58045842897730e7b47c578ad9f175dbf35ad782 (diff)
parent8a33016960fc556929f10df9efae7fb372877441 (diff)
Merge master into haskell-updates
Diffstat (limited to 'pkgs/by-name/ne/neovim-unwrapped/package.nix')
-rw-r--r--pkgs/by-name/ne/neovim-unwrapped/package.nix12
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix
index b7b66d8544ffb..eaf637c88e645 100644
--- a/pkgs/by-name/ne/neovim-unwrapped/package.nix
+++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix
@@ -86,7 +86,11 @@ in {
 
     dontFixCmake = true;
 
-    inherit lua treesitter-parsers;
+    inherit lua;
+    treesitter-parsers = treesitter-parsers //
+      { markdown = treesitter-parsers.markdown // { location = "tree-sitter-markdown"; }; } //
+      { markdown-inline = treesitter-parsers.markdown // { language = "markdown_inline"; location = "tree-sitter-markdown-inline"; }; }
+      ;
 
     buildInputs = [
       gperf
@@ -169,11 +173,13 @@ in {
     '' + ''
       mkdir -p $out/lib/nvim/parser
     '' + lib.concatStrings (lib.mapAttrsToList
-      (language: src: ''
+      (language: grammar: ''
         ln -s \
           ${tree-sitter.buildGrammar {
-            inherit language src;
+            inherit (grammar) src;
             version = "neovim-${finalAttrs.version}";
+            language = grammar.language or language;
+            location = grammar.location or null;
           }}/parser \
           $out/lib/nvim/parser/${language}.so
       '')