Compare commits

..

No commits in common. "43ebb4a2f28181d15e3f7aea3e13292aa7818b63" and "9f104282ca15b762fd6523a82ec9a6c182170489" have entirely different histories.

3 changed files with 92 additions and 55 deletions

18
flake.lock generated
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1764950072, "lastModified": 1764242076,
"narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f61125a668a320878494449750330ca58b78c557", "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -19,11 +19,11 @@
"nvim-treesitter": { "nvim-treesitter": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1765057102, "lastModified": 1764266060,
"narHash": "sha256-2eqOrGqOSis9vHmxe2CIxWfbf92b2iOVLxSSfoNKAw8=", "narHash": "sha256-j2o5c4qgVYQs5DJpSDX1eMsNonDkhyhEQQYMYW2YS7o=",
"owner": "nvim-treesitter", "owner": "nvim-treesitter",
"repo": "nvim-treesitter", "repo": "nvim-treesitter",
"rev": "20db421f5fba0c23f6a7629af96ba6d4fc531677", "rev": "17885756e63df73ed90db62e4630f744ceda6514",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -36,11 +36,11 @@
"nvim-treesitter-textobjects": { "nvim-treesitter-textobjects": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1765057291, "lastModified": 1764294350,
"narHash": "sha256-k4U3MGs01DBeb1NZDF3C8uerRAo4o+CZMhy5v3Ub1BU=", "narHash": "sha256-M7Wfyg1cHXOHKzkhei3GfozK2tsUZ7LZoOdSiHY0dG4=",
"owner": "nvim-treesitter", "owner": "nvim-treesitter",
"repo": "nvim-treesitter-textobjects", "repo": "nvim-treesitter-textobjects",
"rev": "76deedf0f1cec4496ef8d49b6d1f020f6d0c6ec9", "rev": "63c4dce4a56312ef1bdeafd16bdefa008fcc950a",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -43,12 +43,12 @@
angular = buildGrammar { angular = buildGrammar {
passthru.name = "angular"; passthru.name = "angular";
language = "angular"; language = "angular";
version = "0.0.0+rev=3bd2036e710f609ea08fcfca5a1eb1169ecc114f"; version = "0.0.0+rev=56fffa8c9ea7389cb2237f4a01c4a2058ac64416";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dlvandenberg"; owner = "dlvandenberg";
repo = "tree-sitter-angular"; repo = "tree-sitter-angular";
rev = "3bd2036e710f609ea08fcfca5a1eb1169ecc114f"; rev = "56fffa8c9ea7389cb2237f4a01c4a2058ac64416";
hash = "sha256-VdfPZ39AEjvl+9r/LZNRGNIQsiTB9S065AnUc4MeohU="; hash = "sha256-QGTtdFPJYTJ+5Lz5VlwDvikJaXLim/j7wTap/JKDJaY=";
}; };
meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular"; meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular";
requires = [ requires = [
@ -137,12 +137,12 @@
bash = buildGrammar { bash = buildGrammar {
passthru.name = "bash"; passthru.name = "bash";
language = "bash"; language = "bash";
version = "0.0.0+rev=a06c2e4415e9bc0346c6b86d401879ffb44058f7"; version = "0.0.0+rev=20f55fb9663568f16ebceaac7673d2aa530add46";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tree-sitter"; owner = "tree-sitter";
repo = "tree-sitter-bash"; repo = "tree-sitter-bash";
rev = "a06c2e4415e9bc0346c6b86d401879ffb44058f7"; rev = "20f55fb9663568f16ebceaac7673d2aa530add46";
hash = "sha256-ONQ1Ljk3aRWjElSWD2crCFZraZoRj3b3/VELz1789GE="; hash = "sha256-rHHXLHZ9n/gc09kSMYyMPl2VBupbheva0pDV9RrjlT8=";
}; };
meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash";
}; };
@ -218,6 +218,18 @@
}; };
meta.homepage = "https://github.com/EmranMR/tree-sitter-blade"; meta.homepage = "https://github.com/EmranMR/tree-sitter-blade";
}; };
blueprint = buildGrammar {
passthru.name = "blueprint";
language = "blueprint";
version = "0.0.0+rev=355ef84ef8a958ac822117b652cf4d49bac16c79";
src = fetchFromGitLab {
owner = "gabmus";
repo = "tree-sitter-blueprint";
rev = "355ef84ef8a958ac822117b652cf4d49bac16c79";
hash = "sha256-+lkDfAL3zKt+NpvHIb1nyHvHkmZ2Ydh78N22ZOeiErs=";
};
meta.homepage = "https://gitlab.com/gabmus/tree-sitter-blueprint";
};
bp = buildGrammar { bp = buildGrammar {
passthru.name = "bp"; passthru.name = "bp";
language = "bp"; language = "bp";
@ -257,12 +269,12 @@
c3 = buildGrammar { c3 = buildGrammar {
passthru.name = "c3"; passthru.name = "c3";
language = "c3"; language = "c3";
version = "0.0.0+rev=3bcb189c85a15d5e47a12947fbb25cd6604025f5"; version = "0.0.0+rev=2e852d524cdab2e857ac7fb3ad814b39ae858916";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "c3lang"; owner = "c3lang";
repo = "tree-sitter-c3"; repo = "tree-sitter-c3";
rev = "3bcb189c85a15d5e47a12947fbb25cd6604025f5"; rev = "2e852d524cdab2e857ac7fb3ad814b39ae858916";
hash = "sha256-aOvlLAXe7h2RC6oUSuLk6g9XvcrUsSVHV6M0dKkf+MU="; hash = "sha256-AKjdyymtwn6mF+41YuqKTZu506nnzE45m5qeEGwclVU=";
}; };
meta.homepage = "https://github.com/c3lang/tree-sitter-c3"; meta.homepage = "https://github.com/c3lang/tree-sitter-c3";
}; };
@ -525,12 +537,12 @@
desktop = buildGrammar { desktop = buildGrammar {
passthru.name = "desktop"; passthru.name = "desktop";
language = "desktop"; language = "desktop";
version = "0.0.0+rev=f5709fd5297676875aa6d636e52cff7039573cb0"; version = "0.0.0+rev=2d93b616b0c247121dab59590b3182af1a9ecb3b";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ValdezFOmar"; owner = "ValdezFOmar";
repo = "tree-sitter-desktop"; repo = "tree-sitter-desktop";
rev = "f5709fd5297676875aa6d636e52cff7039573cb0"; rev = "2d93b616b0c247121dab59590b3182af1a9ecb3b";
hash = "sha256-FJFqUx2ytTb6Sylfpa6a5g5OguhhAlj5V4Nn3y0N9zc="; hash = "sha256-voo8OV/eaZMoo1HnBLTyI7jIb6ZzvexrUZK1IPJhRfs=";
}; };
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-desktop"; meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-desktop";
}; };
@ -719,12 +731,12 @@
elm = buildGrammar { elm = buildGrammar {
passthru.name = "elm"; passthru.name = "elm";
language = "elm"; language = "elm";
version = "0.0.0+rev=3d000d37b99ac2640bf24c1a7a5c9a58485778df"; version = "0.0.0+rev=027728466b8115cf807517af943cbeaed34053fc";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elm-tooling"; owner = "elm-tooling";
repo = "tree-sitter-elm"; repo = "tree-sitter-elm";
rev = "3d000d37b99ac2640bf24c1a7a5c9a58485778df"; rev = "027728466b8115cf807517af943cbeaed34053fc";
hash = "sha256-17HyH70Odvi4nT8Lox/EpTBSYipBkas0TKcX3stLcvQ="; hash = "sha256-vaeGViXob7AYyJj93AUJWBD8Zdfs4zXdKikvBZ3GptU=";
}; };
meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm"; meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm";
}; };
@ -875,24 +887,24 @@
forth = buildGrammar { forth = buildGrammar {
passthru.name = "forth"; passthru.name = "forth";
language = "forth"; language = "forth";
version = "0.0.0+rev=360ef13f8c609ec6d2e80782af69958b84e36cd0"; version = "0.0.0+rev=90189238385cf636b9ee99ce548b9e5b5e569d48";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AlexanderBrevig"; owner = "AlexanderBrevig";
repo = "tree-sitter-forth"; repo = "tree-sitter-forth";
rev = "360ef13f8c609ec6d2e80782af69958b84e36cd0"; rev = "90189238385cf636b9ee99ce548b9e5b5e569d48";
hash = "sha256-d7X1Ubd9tKMQgNHlH+sQxmcsgLWB4mxR5CIdyKkLnM8="; hash = "sha256-vySBDu9cMnubu4+7/sBttNxg1S4/MxWUKpjwEa14Rws=";
}; };
meta.homepage = "https://github.com/AlexanderBrevig/tree-sitter-forth"; meta.homepage = "https://github.com/AlexanderBrevig/tree-sitter-forth";
}; };
fortran = buildGrammar { fortran = buildGrammar {
passthru.name = "fortran"; passthru.name = "fortran";
language = "fortran"; language = "fortran";
version = "0.0.0+rev=d0d1bc84c43870788c1b402f2e6b490b27257f9e"; version = "0.0.0+rev=8334abca785db3a041292e3b3b818a82a55b238f";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stadelmanma"; owner = "stadelmanma";
repo = "tree-sitter-fortran"; repo = "tree-sitter-fortran";
rev = "d0d1bc84c43870788c1b402f2e6b490b27257f9e"; rev = "8334abca785db3a041292e3b3b818a82a55b238f";
hash = "sha256-xPsi/9P+DKuqaOoJ8NTORoa/dmjjEZaEJPUz53yMC6E="; hash = "sha256-MQ0Mq1kpP69oz8pAjLR/kKP491zSmKSseVktoOf5kkc=";
}; };
meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
}; };
@ -933,6 +945,18 @@
}; };
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-func"; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-func";
}; };
fusion = buildGrammar {
passthru.name = "fusion";
language = "fusion";
version = "0.0.0+rev=19db2f47ba4c3a0f6238d4ae0e2abfca16e61dd6";
src = fetchFromGitLab {
owner = "jirgn";
repo = "tree-sitter-fusion";
rev = "19db2f47ba4c3a0f6238d4ae0e2abfca16e61dd6";
hash = "sha256-195q39pZYipT0G08kQlwnDE28ODjAz2/Sq1tzpEGFmU=";
};
meta.homepage = "https://gitlab.com/jirgn/tree-sitter-fusion";
};
gap = buildGrammar { gap = buildGrammar {
passthru.name = "gap"; passthru.name = "gap";
language = "gap"; language = "gap";
@ -1532,12 +1556,12 @@
inko = buildGrammar { inko = buildGrammar {
passthru.name = "inko"; passthru.name = "inko";
language = "inko"; language = "inko";
version = "0.0.0+rev=v0.4.0"; version = "0.0.0+rev=9d7ed4f6c0ea2a8f846f3bb00e33ab21ec9ca379";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "inko-lang"; owner = "inko-lang";
repo = "tree-sitter-inko"; repo = "tree-sitter-inko";
rev = "v0.4.0"; rev = "9d7ed4f6c0ea2a8f846f3bb00e33ab21ec9ca379";
hash = "sha256-qgB2s/ghmOGjJ+MH7p3ZQKa+RMxx58642Z9lYC1wlq4="; hash = "sha256-UpvWFY6JzVTBWzLRw43o1I86/GizS+Ay/VR4BaoUBLU=";
}; };
meta.homepage = "https://github.com/inko-lang/tree-sitter-inko"; meta.homepage = "https://github.com/inko-lang/tree-sitter-inko";
}; };
@ -1681,6 +1705,19 @@
}; };
meta.homepage = "https://github.com/Joakker/tree-sitter-json5"; meta.homepage = "https://github.com/Joakker/tree-sitter-json5";
}; };
jsonc = buildGrammar {
passthru.name = "jsonc";
language = "jsonc";
version = "0.0.0+rev=02b01653c8a1c198ae7287d566efa86a135b30d5";
src = fetchFromGitLab {
owner = "WhyNotHugo";
repo = "tree-sitter-jsonc";
rev = "02b01653c8a1c198ae7287d566efa86a135b30d5";
hash = "sha256-iWc2ePRiQnZ0FEdMAaAwa3iYt/SY0bEjQrZyqE9EhlU=";
};
meta.homepage = "https://gitlab.com/WhyNotHugo/tree-sitter-jsonc";
requires = [ "json" ];
};
jsonnet = buildGrammar { jsonnet = buildGrammar {
passthru.name = "jsonnet"; passthru.name = "jsonnet";
language = "jsonnet"; language = "jsonnet";
@ -2049,12 +2086,12 @@
mlir = buildGrammar { mlir = buildGrammar {
passthru.name = "mlir"; passthru.name = "mlir";
language = "mlir"; language = "mlir";
version = "0.0.0+rev=834a0b01e98eaf4313dfd48778e20bef1738ff8f"; version = "0.0.0+rev=80ac665f68a5d1c6ca0443f71b6cd60e24e84157";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "artagnon"; owner = "artagnon";
repo = "tree-sitter-mlir"; repo = "tree-sitter-mlir";
rev = "834a0b01e98eaf4313dfd48778e20bef1738ff8f"; rev = "80ac665f68a5d1c6ca0443f71b6cd60e24e84157";
hash = "sha256-ed7h87jGE1C0ryj/4MWdLExiIt+BSk5YYU/IVYJ47Zs="; hash = "sha256-052xMqQoaYIahDpznCqQi7D5l3lFDICqRerpWXpI3F4=";
}; };
meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
generate = true; generate = true;
@ -2147,12 +2184,12 @@
nix = buildGrammar { nix = buildGrammar {
passthru.name = "nix"; passthru.name = "nix";
language = "nix"; language = "nix";
version = "0.0.0+rev=eabf96807ea4ab6d6c7f09b671a88cd483542840"; version = "0.0.0+rev=bfcb03e6ddccc5a1eb84cea0176096f85a7af333";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nix-community"; owner = "nix-community";
repo = "tree-sitter-nix"; repo = "tree-sitter-nix";
rev = "eabf96807ea4ab6d6c7f09b671a88cd483542840"; rev = "bfcb03e6ddccc5a1eb84cea0176096f85a7af333";
hash = "sha256-cSiBd0XkSR8l1CF2vkThWUtMxqATwuxCNO5oy2kyOZY="; hash = "sha256-S3YgbP5u5ybrboJUwE9KVALS92X7ojc0fBnA4StQhxc=";
}; };
meta.homepage = "https://github.com/nix-community/tree-sitter-nix"; meta.homepage = "https://github.com/nix-community/tree-sitter-nix";
}; };
@ -2359,12 +2396,12 @@
pkl = buildGrammar { pkl = buildGrammar {
passthru.name = "pkl"; passthru.name = "pkl";
language = "pkl"; language = "pkl";
version = "0.0.0+rev=d50709f1b71e77844c4551c655792d100a5ca559"; version = "0.0.0+rev=82f0e990b727374014371681457cc6ea5c3daa97";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "apple"; owner = "apple";
repo = "tree-sitter-pkl"; repo = "tree-sitter-pkl";
rev = "d50709f1b71e77844c4551c655792d100a5ca559"; rev = "82f0e990b727374014371681457cc6ea5c3daa97";
hash = "sha256-Q5feMUI0w1NinR9o3pE3bH7qAFMcF0xOwWlZjughTqM="; hash = "sha256-USRl2LghA0e+shclJFp6HxDKJf6+txslMZiQ4pCfOvw=";
}; };
meta.homepage = "https://github.com/apple/tree-sitter-pkl"; meta.homepage = "https://github.com/apple/tree-sitter-pkl";
}; };
@ -2419,12 +2456,12 @@
powershell = buildGrammar { powershell = buildGrammar {
passthru.name = "powershell"; passthru.name = "powershell";
language = "powershell"; language = "powershell";
version = "0.0.0+rev=17f0c1a6514d3b46e64df7b88f464c0bd85078a6"; version = "0.0.0+rev=9379c77984af1f3d3d7e3cc5e897de3496725280";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "airbus-cert"; owner = "airbus-cert";
repo = "tree-sitter-powershell"; repo = "tree-sitter-powershell";
rev = "17f0c1a6514d3b46e64df7b88f464c0bd85078a6"; rev = "9379c77984af1f3d3d7e3cc5e897de3496725280";
hash = "sha256-qjUq7gs7E0ad0jO89rr0cTyznH3mkpgo2g0CRzD+vzc="; hash = "sha256-VEyqf906V5iTUcxbSHf72Ih+VQ4Llcu0555v5+CVZkE=";
}; };
meta.homepage = "https://github.com/airbus-cert/tree-sitter-powershell"; meta.homepage = "https://github.com/airbus-cert/tree-sitter-powershell";
}; };
@ -3381,12 +3418,12 @@
templ = buildGrammar { templ = buildGrammar {
passthru.name = "templ"; passthru.name = "templ";
language = "templ"; language = "templ";
version = "0.0.0+rev=3057cd485f7f23a8ad24107c6adc604f8c5ce3db"; version = "0.0.0+rev=1975f67058325403c5412cde48b181a3fa817870";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vrischmann"; owner = "vrischmann";
repo = "tree-sitter-templ"; repo = "tree-sitter-templ";
rev = "3057cd485f7f23a8ad24107c6adc604f8c5ce3db"; rev = "1975f67058325403c5412cde48b181a3fa817870";
hash = "sha256-iv5Egh0CcBEsD86IGESI5Bn0NcGji3wruD8UR1JNlk0="; hash = "sha256-3zcsIy+UNNUNua0iZW96jXrgVRkYZLFj6ND2coq4E7g=";
}; };
meta.homepage = "https://github.com/vrischmann/tree-sitter-templ"; meta.homepage = "https://github.com/vrischmann/tree-sitter-templ";
}; };
@ -3865,12 +3902,12 @@
xresources = buildGrammar { xresources = buildGrammar {
passthru.name = "xresources"; passthru.name = "xresources";
language = "xresources"; language = "xresources";
version = "0.0.0+rev=a96227aaa37e5f8e1a5888bfac2dcb31ad0bf1f1"; version = "0.0.0+rev=d466418f1c8850276bb7787a135372cb70868b1d";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ValdezFOmar"; owner = "ValdezFOmar";
repo = "tree-sitter-xresources"; repo = "tree-sitter-xresources";
rev = "a96227aaa37e5f8e1a5888bfac2dcb31ad0bf1f1"; rev = "d466418f1c8850276bb7787a135372cb70868b1d";
hash = "sha256-yNOpIFc7jdXWWeoo1C1JwSx121BO1sHYbiiieQyxNPM="; hash = "sha256-xoCHXWY2oCXSs2qrEA5AdJ4zCRTmqPdFhmK6Mdpv+Oc=";
}; };
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources"; meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources";
}; };
@ -3963,12 +4000,12 @@
zsh = buildGrammar { zsh = buildGrammar {
passthru.name = "zsh"; passthru.name = "zsh";
language = "zsh"; language = "zsh";
version = "0.0.0+rev=v0.48.0"; version = "0.0.0+rev=v0.47.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "georgeharker"; owner = "georgeharker";
repo = "tree-sitter-zsh"; repo = "tree-sitter-zsh";
rev = "v0.48.0"; rev = "v0.47.0";
hash = "sha256-gBbT2xt32fKt54nh4Dp6EK6uUd63rsIEmmK4nr9Pg1Y="; hash = "sha256-GOSBnGXBURBxg+hm0QKSYJuj/pcXOGDdsErOuSVEXcA=";
}; };
meta.homepage = "https://github.com/georgeharker/tree-sitter-zsh"; meta.homepage = "https://github.com/georgeharker/tree-sitter-zsh";
}; };

View file

@ -79,7 +79,7 @@ let
# patch nvim-treesitter with parser bundle path # patch nvim-treesitter with parser bundle path
ln -sfT ${bundle}/parser $out/parser ln -sfT ${bundle}/parser $out/parser
substituteInPlace $out/lua/nvim-treesitter/config.lua \ substituteInPlace $out/lua/nvim-treesitter/config.lua \
--replace-fail "install_dir = vim.fs.joinpath(vim.fn.stdpath('data') --[[@as string]], 'site')," \ --replace-fail "install_dir = vim.fs.joinpath(vim.fn.stdpath('data'), 'site')," \
"install_dir = '$out'" "install_dir = '$out'"
''; '';
}); });