summary refs log tree commit diff
path: root/pkgs/development/tools/parsing
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2023-10-07 19:52:18 +0000
committerAlyssa Ross <hi@alyssa.is>2023-10-07 19:52:18 +0000
commit182718fecc3b6c35419ee0d085a87b579c4965f8 (patch)
tree3932c5f76c0c4a1c1cd7b093bad530707d1938d1 /pkgs/development/tools/parsing
parentf33fceca13083254086639741c2bd52b51e45bcb (diff)
parent4309990c6fffe6c810d6aba0b12ecb350970f0c4 (diff)
downloadnixpkgs-182718fecc3b6c35419ee0d085a87b579c4965f8.tar
nixpkgs-182718fecc3b6c35419ee0d085a87b579c4965f8.tar.gz
nixpkgs-182718fecc3b6c35419ee0d085a87b579c4965f8.tar.bz2
nixpkgs-182718fecc3b6c35419ee0d085a87b579c4965f8.tar.lz
nixpkgs-182718fecc3b6c35419ee0d085a87b579c4965f8.tar.xz
nixpkgs-182718fecc3b6c35419ee0d085a87b579c4965f8.tar.zst
nixpkgs-182718fecc3b6c35419ee0d085a87b579c4965f8.zip
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/top-level/linux-kernels.nix
Diffstat (limited to 'pkgs/development/tools/parsing')
-rw-r--r--pkgs/development/tools/parsing/tree-sitter/grammars/default.nix1
-rw-r--r--pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json12
-rw-r--r--pkgs/development/tools/parsing/tree-sitter/update.nix4
3 files changed, 17 insertions, 0 deletions
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
index 68574a248b7..0140f123643 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
@@ -93,6 +93,7 @@
   tree-sitter-tsq = lib.importJSON ./tree-sitter-tsq.json;
   tree-sitter-turtle = lib.importJSON ./tree-sitter-turtle.json;
   tree-sitter-typescript = lib.importJSON ./tree-sitter-typescript.json;
+  tree-sitter-typst = lib.importJSON ./tree-sitter-typst.json;
   tree-sitter-verilog = lib.importJSON ./tree-sitter-verilog.json;
   tree-sitter-vim = lib.importJSON ./tree-sitter-vim.json;
   tree-sitter-vue = lib.importJSON ./tree-sitter-vue.json;
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json
new file mode 100644
index 00000000000..d85d551b9a8
--- /dev/null
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json
@@ -0,0 +1,12 @@
+{
+  "url": "https://github.com/uben0/tree-sitter-typst",
+  "rev": "b8f3ac3a00247b5be0da2123e6b2d79e3dca4aff",
+  "date": "2023-09-17T16:51:18+02:00",
+  "path": "/nix/store/k4sh7jiqrry4960ygjbs72qvi9amd3s8-tree-sitter-typst",
+  "sha256": "1qihml8jkc32ra1ijmrc1crjmqxspdq163k0hhy9rrq6sqgyh33w",
+  "hash": "sha256-fAzoH9YG55w8hGAOE3C7uuMqMwssVxmDymKwKRGtMOI=",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix
index 39b064cf4b3..b2267f33c7b 100644
--- a/pkgs/development/tools/parsing/tree-sitter/update.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/update.nix
@@ -143,6 +143,10 @@ let
       repo = "tree-sitter-sql";
       branch = "gh-pages";
     };
+    "tree-sitter-typst" = {
+      orga = "uben0";
+      repo = "tree-sitter-typst";
+    };
     "tree-sitter-vim" = {
       orga = "vigoux";
       repo = "tree-sitter-viml";