diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index d2619af..6627c39 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -9,12 +9,6 @@ jobs: - uses: actions/checkout@v4 - uses: DeterminateSystems/nix-installer-action@main - uses: DeterminateSystems/flakehub-cache-action@main - - uses: cachix/cachix-action@master - if: github.ref == 'refs/heads/master' - with: - name: nvim-treesitter-main - authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - run: nix flake check - run: nix run nixpkgs#nixfmt **/*.nix diff --git a/README.md b/README.md index d948e4b..88bf18a 100644 --- a/README.md +++ b/README.md @@ -69,24 +69,6 @@ overlays = [ If you need the unpatched `nvim-treesitter` plugin without any parsers/queries bundled, even after you overlay it, you can use the `nvim-treesitter-unwrapped` output of this overlay. -## Cache - -Add our `cachix` repo to avoid needing to build grammars locally. - -```nix - nix = { - settings = { - substituters = [ - "https://nvim-treesitter-main.cachix.org" - ]; - trusted-public-keys = [ - "nvim-treesitter-main.cachix.org-1:cbwE6blfW5+BkXXyeAXoVSu1gliqPLHo2m98E4hWfZQ=" - ]; - }; - }; -``` - - ## Updating To update the list of parsers in `generated.nix`: diff --git a/flake.lock b/flake.lock index cc085bb..fda128b 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1760524057, - "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", + "lastModified": 1760038930, + "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", + "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3", "type": "github" }, "original": { @@ -19,11 +19,11 @@ "nvim-treesitter": { "flake": false, "locked": { - "lastModified": 1760866486, - "narHash": "sha256-ZeNCXy6+I18N+Nu2sKnEk2otVEb8V3tKhL8Jq95wS5k=", + "lastModified": 1760260935, + "narHash": "sha256-To/syCZPs7vKA0WkuBz7ZxCGT/wzj705QfxZng6Nsjo=", "owner": "nvim-treesitter", "repo": "nvim-treesitter", - "rev": "71bf1665f804d46f7e4b24ad7ffc11f6ea5b271a", + "rev": "0606c7a9dcaa5c5beee0b0f09043e9fdd1ba0a68", "type": "github" }, "original": { diff --git a/generated.nix b/generated.nix index 9f3053f..0f43ef7 100644 --- a/generated.nix +++ b/generated.nix @@ -19,12 +19,12 @@ ada = buildGrammar { passthru.name = "ada"; language = "ada"; - version = "0.0.0+rev=6c26c4413965dc7bacbccfa66503bf6b8228e254"; + version = "0.0.0+rev=b23672d313b4c994ab96fd54f1b7ff15eac68a55"; src = fetchFromGitHub { owner = "briot"; repo = "tree-sitter-ada"; - rev = "6c26c4413965dc7bacbccfa66503bf6b8228e254"; - hash = "sha256-kxm6MVUktOzH6WVKZxgGO9kFFEUXk7NFk+twidsDNM0="; + rev = "b23672d313b4c994ab96fd54f1b7ff15eac68a55"; + hash = "sha256-XkJmrMppr1+1uPQwqAHcf1XBccwGexL0euXZBUX7xlM="; }; meta.homepage = "https://github.com/briot/tree-sitter-ada"; }; @@ -365,12 +365,12 @@ cmake = buildGrammar { passthru.name = "cmake"; language = "cmake"; - version = "0.0.0+rev=c7b2a71e7f8ecb167fad4c97227c838439280175"; + version = "0.0.0+rev=cf9799600b2ba5e6620fdabddec3b2db8306bc46"; src = fetchFromGitHub { owner = "uyha"; repo = "tree-sitter-cmake"; - rev = "c7b2a71e7f8ecb167fad4c97227c838439280175"; - hash = "sha256-+Lom3xjPmhhZr3G4aV054lbhLjvJsPaQalSqkKUijvU="; + rev = "cf9799600b2ba5e6620fdabddec3b2db8306bc46"; + hash = "sha256-OxViW7H5fNc5BP072ob7GGgx1EYc6TiQEut0wHGrE1c="; }; meta.homepage = "https://github.com/uyha/tree-sitter-cmake"; }; @@ -537,12 +537,12 @@ desktop = buildGrammar { passthru.name = "desktop"; language = "desktop"; - version = "0.0.0+rev=de6482e226443a210f27627e0240c12aa25c2925"; + version = "0.0.0+rev=73b9f3ac30ac8d01267a16b1c4f0880aecdb56b2"; src = fetchFromGitHub { owner = "ValdezFOmar"; repo = "tree-sitter-desktop"; - rev = "de6482e226443a210f27627e0240c12aa25c2925"; - hash = "sha256-knf7D44R22e/WV1rtrXJ1DVGhYJ7EM3r76ze0jtig/c="; + rev = "73b9f3ac30ac8d01267a16b1c4f0880aecdb56b2"; + hash = "sha256-7rvP/wNN4od+oVZy77p+u5iNK6l8bzzGaosMb/0kCEM="; }; meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-desktop"; }; @@ -621,12 +621,12 @@ dot = buildGrammar { passthru.name = "dot"; language = "dot"; - version = "0.0.0+rev=71e2c5241eef9de920a4efedfefd1d527dd9a118"; + version = "0.0.0+rev=9ab85550c896d8b294d9b9ca1e30698736f08cea"; src = fetchFromGitHub { owner = "rydesun"; repo = "tree-sitter-dot"; - rev = "71e2c5241eef9de920a4efedfefd1d527dd9a118"; - hash = "sha256-Z1XtNX1zV8xGlsaFbqh2VXPAx0fs4D7JxwqaEWSWcB0="; + rev = "9ab85550c896d8b294d9b9ca1e30698736f08cea"; + hash = "sha256-w4DInIT7mkTvQ6Hmi8yaAww6ktyNgRz0tPfBLGnOawQ="; }; meta.homepage = "https://github.com/rydesun/tree-sitter-dot"; }; @@ -2086,12 +2086,12 @@ mlir = buildGrammar { passthru.name = "mlir"; language = "mlir"; - version = "0.0.0+rev=47c3f2cf3b10016503f2577c2d99c15bb2053402"; + version = "0.0.0+rev=7eadef0de98de1170cdffb68c0931e375fc1b046"; src = fetchFromGitHub { owner = "artagnon"; repo = "tree-sitter-mlir"; - rev = "47c3f2cf3b10016503f2577c2d99c15bb2053402"; - hash = "sha256-1NmkSEGh6Y9BIGcdW4HrMNdqlKKfVHgcY1Amk4EKf8U="; + rev = "7eadef0de98de1170cdffb68c0931e375fc1b046"; + hash = "sha256-/zOS9fvfnFotySPw2+DY9ob8s+PYJrRgb1ymx2l5JAc="; }; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; generate = true; @@ -2208,12 +2208,12 @@ nu = buildGrammar { passthru.name = "nu"; language = "nu"; - version = "0.0.0+rev=4f4ac8667c1e7f80d0d9f9534845e63026210aaf"; + version = "0.0.0+rev=e1509fc9f9aa6579430a65f167528617df56b107"; src = fetchFromGitHub { owner = "nushell"; repo = "tree-sitter-nu"; - rev = "4f4ac8667c1e7f80d0d9f9534845e63026210aaf"; - hash = "sha256-Zkl5V7Rcw+1HoT1U5q8wRVR17wq6qP3gHPhiLYKF7H8="; + rev = "e1509fc9f9aa6579430a65f167528617df56b107"; + hash = "sha256-uWXmeO9oCanbUc3kYdAaRUh5BuLdnytd5iTwUUWsoHo="; }; meta.homepage = "https://github.com/nushell/tree-sitter-nu"; }; @@ -2665,12 +2665,12 @@ qmljs = buildGrammar { passthru.name = "qmljs"; language = "qmljs"; - version = "0.0.0+rev=0bec4359a7eb2f6c9220cd57372d87d236f66d59"; + version = "0.0.0+rev=0889da4632bba3ec6f39ef4102625654890c15c1"; src = fetchFromGitHub { owner = "yuja"; repo = "tree-sitter-qmljs"; - rev = "0bec4359a7eb2f6c9220cd57372d87d236f66d59"; - hash = "sha256-tV4lipey+OAQwygRFp9lQAzgCNiZzSu7p3Mr6CCBH1g="; + rev = "0889da4632bba3ec6f39ef4102625654890c15c1"; + hash = "sha256-Twj2taG7xFTPXTvzDcWeIqxUAkuhsybwZvtwK/HiruE="; }; meta.homepage = "https://github.com/yuja/tree-sitter-qmljs"; requires = [ "ecma" ]; @@ -3151,12 +3151,12 @@ sparql = buildGrammar { passthru.name = "sparql"; language = "sparql"; - version = "0.0.0+rev=1ef52d35a73a2a5f2e433ecfd1c751c1360a923b"; + version = "0.0.0+rev=d853661ca680d8ff7f8d800182d5782b61d0dd58"; src = fetchFromGitHub { owner = "GordianDziwis"; repo = "tree-sitter-sparql"; - rev = "1ef52d35a73a2a5f2e433ecfd1c751c1360a923b"; - hash = "sha256-9DaV12dkcwF7/jWc4QaTQaHcKu5zO5evWlXGNZMdRqc="; + rev = "d853661ca680d8ff7f8d800182d5782b61d0dd58"; + hash = "sha256-0BV0y8IyeIPpuxTixlJL1PsDCuhXbGaImu8JU8WFoPU="; }; meta.homepage = "https://github.com/GordianDziwis/tree-sitter-sparql"; }; @@ -3175,12 +3175,12 @@ sql = buildGrammar { passthru.name = "sql"; language = "sql"; - version = "0.0.0+rev=d71f2bd7f0e3dba84df7025fc9314738d180e71e"; + version = "0.0.0+rev=4afe285bb142542cee0aa7b689fec00a71df4741"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "d71f2bd7f0e3dba84df7025fc9314738d180e71e"; - hash = "sha256-udLPpb8ihPb9mXNicwZdml2bKeIDC0RD5i7SPshrN2g="; + rev = "4afe285bb142542cee0aa7b689fec00a71df4741"; + hash = "sha256-Qzrun7sIjX+jyz0oh4MotfTSXAcEYSM/2+CAWJkXgVo="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -3259,12 +3259,12 @@ superhtml = buildGrammar { passthru.name = "superhtml"; language = "superhtml"; - version = "0.0.0+rev=8b5bb272b269afdd38cdf641c4a707dd92fbe902"; + version = "0.0.0+rev=aeaa0c7d9ef983453952a2ee4983476fef0168f3"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "superhtml"; - rev = "8b5bb272b269afdd38cdf641c4a707dd92fbe902"; - hash = "sha256-9RizfSi+ouCcLUL2+gPc8GljNo9KCX57VElLSlha05A="; + rev = "aeaa0c7d9ef983453952a2ee4983476fef0168f3"; + hash = "sha256-3mCdFn2ZsRFn/UI+frWD0MTx8qdiZldveYffpZ7nd98="; }; meta.homepage = "https://github.com/kristoff-it/superhtml"; location = "tree-sitter-superhtml"; @@ -3346,26 +3346,26 @@ systemverilog = buildGrammar { passthru.name = "systemverilog"; language = "systemverilog"; - version = "0.0.0+rev=7c4b01b7df2f6e7fa1f698c9d30ac8f93af18ed2"; + version = "0.0.0+rev=e88937e66adc3ee7be0bfe40b7e937eafe4212bb"; src = fetchFromGitHub { owner = "gmlarumbe"; repo = "tree-sitter-systemverilog"; - rev = "7c4b01b7df2f6e7fa1f698c9d30ac8f93af18ed2"; - hash = "sha256-u0a8yQfFwYbAhuT8VZjKPuTfBNwAaQ0e25CcIek0thc="; + rev = "e88937e66adc3ee7be0bfe40b7e937eafe4212bb"; + hash = "sha256-wzsjHDn6ZdGfOlufARurxCTwT8HqMvyfsnIIpXzRUYs="; }; meta.homepage = "https://github.com/gmlarumbe/tree-sitter-systemverilog"; }; t32 = buildGrammar { passthru.name = "t32"; language = "t32"; - version = "0.0.0+rev=2f604ad17a15c09d99648199da7f173eed8250dc"; - src = fetchFromGitHub { + version = "0.0.0+rev=d4e26ab7a730cfbe0cf84dba6ea3647989064839"; + src = fetchFromGitLab { owner = "xasc"; repo = "tree-sitter-t32"; - rev = "2f604ad17a15c09d99648199da7f173eed8250dc"; - hash = "sha256-9J8wy/7qW4vWsIzpDI+lVWr/6158jrod0nSk3ihXUPI="; + rev = "d4e26ab7a730cfbe0cf84dba6ea3647989064839"; + hash = "sha256-awbgOZaIqpdjsskSr6by2AyojVRU+gkLgS70abhPryE="; }; - meta.homepage = "https://github.com/xasc/tree-sitter-t32"; + meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32"; }; tablegen = buildGrammar { passthru.name = "tablegen"; @@ -3505,12 +3505,12 @@ tmux = buildGrammar { passthru.name = "tmux"; language = "tmux"; - version = "0.0.0+rev=815f8fa5ac7aeb6246c14896d16082fecdf98b2b"; + version = "0.0.0+rev=72b42cd0307bdfe471fd151a0282d0d38e889944"; src = fetchFromGitHub { owner = "Freed-Wu"; repo = "tree-sitter-tmux"; - rev = "815f8fa5ac7aeb6246c14896d16082fecdf98b2b"; - hash = "sha256-qOvP0ZMRBOGkr1qzlVfq85l8AkQHUGXVqZtix5GLcPo="; + rev = "72b42cd0307bdfe471fd151a0282d0d38e889944"; + hash = "sha256-Rcyx38ZwtmNeQuSHeLkpn860yfJoZp7skUFmkNGLpHI="; }; meta.homepage = "https://github.com/Freed-Wu/tree-sitter-tmux"; }; @@ -3903,12 +3903,12 @@ xresources = buildGrammar { passthru.name = "xresources"; language = "xresources"; - version = "0.0.0+rev=321231f99e3704f1555de14cda5dca93ee14a95b"; + version = "0.0.0+rev=fd546d43fe0a179b59dfdfb296082c584870e11b"; src = fetchFromGitHub { owner = "ValdezFOmar"; repo = "tree-sitter-xresources"; - rev = "321231f99e3704f1555de14cda5dca93ee14a95b"; - hash = "sha256-W7/eYAGC+usKoUdT4JgP+0d3/FykrK/lkBSvhy38qQE="; + rev = "fd546d43fe0a179b59dfdfb296082c584870e11b"; + hash = "sha256-KbXPadsIADNqINBwjewDzkHHVoVhE6X0ltgWIPDGlrg="; }; meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources"; };