diff --git a/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default-grammars.json b/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default-grammars.json
index 746ec60669df..1cfa52fed5b5 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default-grammars.json
+++ b/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default-grammars.json
@@ -1,5 +1,4 @@
 [
-  "tree-sitter-agda",
   "tree-sitter-bash",
   "tree-sitter-c",
   "tree-sitter-c-sharp",
@@ -7,11 +6,11 @@
   "tree-sitter-css",
   "tree-sitter-elixir",
   "tree-sitter-elm",
-  "tree-sitter-fluent",
   "tree-sitter-go",
   "tree-sitter-haskell",
   "tree-sitter-hcl",
   "tree-sitter-html",
+  "tree-sitter-janet-simple",
   "tree-sitter-java",
   "tree-sitter-javascript",
   "tree-sitter-jsdoc",
@@ -19,6 +18,8 @@
   "tree-sitter-julia",
   "tree-sitter-nix",
   "tree-sitter-ocaml",
+  "tree-sitter-perl",
+  "tree-sitter-pgn",
   "tree-sitter-php",
   "tree-sitter-prisma",
   "tree-sitter-python",
@@ -27,5 +28,6 @@
   "tree-sitter-scala",
   "tree-sitter-typescript",
   "tree-sitter-verilog",
+  "tree-sitter-yaml",
   "tree-sitter-zig"
 ]
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
index b3e325ffc9a6..de6ff5f66042 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
@@ -1,6 +1,5 @@
 { lib }:
 {
-  tree-sitter-agda = lib.importJSON ./tree-sitter-agda.json;
   tree-sitter-bash = lib.importJSON ./tree-sitter-bash.json;
   tree-sitter-beancount = lib.importJSON ./tree-sitter-beancount.json;
   tree-sitter-bibtex = lib.importJSON ./tree-sitter-bibtex.json;
@@ -25,7 +24,6 @@
   tree-sitter-erlang = lib.importJSON ./tree-sitter-erlang.json;
   tree-sitter-fennel = lib.importJSON ./tree-sitter-fennel.json;
   tree-sitter-fish = lib.importJSON ./tree-sitter-fish.json;
-  tree-sitter-fluent = lib.importJSON ./tree-sitter-fluent.json;
   tree-sitter-fortran = lib.importJSON ./tree-sitter-fortran.json;
   tree-sitter-gdscript = lib.importJSON ./tree-sitter-gdscript.json;
   tree-sitter-glimmer = lib.importJSON ./tree-sitter-glimmer.json;
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-agda.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-agda.json
deleted file mode 100644
index 36dd834d4d0f..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-agda.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-agda",
-  "rev": "d710ff14d15ddee3764fd73a0837c6c4c8c913e9",
-  "date": "2019-09-20T18:06:06+08:00",
-  "path": "/nix/store/wqz9v9znaiwhhqi19hgig9bn0yvl4i9s-tree-sitter-agda",
-  "sha256": "1wpfj47l97pxk3i9rzdylqipy849r482fnj3lmx8byhalv7z1vm6",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fluent.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fluent.json
deleted file mode 100644
index 6eeb5ccfe0a5..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fluent.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-fluent",
-  "rev": "858fdd6f1e81992e00d3541bfb31bac9365d7a47",
-  "date": "2018-06-18T13:00:38-07:00",
-  "path": "/nix/store/zbj8abdlrqi9swm8qn8rhpqmjwcz145f-tree-sitter-fluent",
-  "sha256": "0528v9w0cs73p9048xrddb1wpdhr92sn1sw8yyqfrq5sq0danr9k",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json
index 5b968a05ec6a..94d548e75919 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-julia",
-  "rev": "8fb38abff74652c4faddbf04d2d5bbbc6b4bae25",
-  "date": "2022-11-01T17:30:42-05:00",
-  "path": "/nix/store/58qk62ilnkwqbqc5y0ah1ky5z4n4d4xr-tree-sitter-julia",
-  "sha256": "06h5nyxw72z3w5a62y59332w2xg90sm3c2j6na7vvf7nark7vb8v",
+  "rev": "bedd19f3c3d745c3da8451a35c7bfc5f48d07ee6",
+  "date": "2022-11-05T17:27:50-05:00",
+  "path": "/nix/store/ldklarlvv3jlxsfi7gnqmim7csnxp2qf-tree-sitter-julia",
+  "sha256": "0cnp0rff6igjfz9i8ckffj9r1fr2nzdw82hag6dml331z7nbjjkf",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json
index aaf8f656bed1..b70beb42a1f7 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/ganezdragon/tree-sitter-perl",
-  "rev": "ff5c3108083af6fcb7575e32a7558b8165a05bcd",
-  "date": "2022-07-18T20:23:41+05:30",
-  "path": "/nix/store/29ijys20vg6qyc2999vjiylwi9nrq3y4-tree-sitter-perl",
-  "sha256": "1zsffd55sldc1148wyjm0kh8knm4849wgwvdvwhchpzn6ji6yf8i",
+  "rev": "749d26fe13fb131b92e6515416096e572575b981",
+  "date": "2022-11-05T19:54:52+05:30",
+  "path": "/nix/store/b2w0s5livx7ysni6jlwwpmkd0f3wvqnh-tree-sitter-perl",
+  "sha256": "1ldl83nia3ij7ps5nx5fqzz5pzwzcmphajjhjf1vnrbm11zfzqjl",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json
index b77bf59251b6..c417a035d857 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/6cdh/tree-sitter-scheme",
-  "rev": "af0fd1fa452cb2562dc7b5c8a8c55551c39273b9",
-  "date": "2022-09-30T20:37:24+08:00",
-  "path": "/nix/store/gra9hiqd3rqgvvq10m3z6lzjf0y0lfz0-tree-sitter-scheme",
-  "sha256": "1pk1q8lmgj2mh7fmyvsr610qdv1c7nmfqdbr1bln1ar356dv6zrb",
+  "rev": "bdcd2c8496701153506a9e3e1b76dfed852873ba",
+  "date": "2022-11-06T17:17:49+08:00",
+  "path": "/nix/store/l096qb2872kab34avgscn9bwizrzail5-tree-sitter-scheme",
+  "sha256": "12knvhmayck9da3zj2w55al4yjhkkr9gxmfdmrjiz7vn9wc1dxr9",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json
index c80f1eaddd1e..5149a66fee35 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json
@@ -1,9 +1,9 @@
 {
-  "url": "https://github.com/m-novikov/tree-sitter-sql",
-  "rev": "218b672499729ef71e4d66a949e4a1614488aeaa",
-  "date": "2022-06-30T19:50:55+02:00",
-  "path": "/nix/store/rcdcgwb28jblgb65k5zjw5zgmigiqjfl-tree-sitter-sql",
-  "sha256": "1j68h5jzc0d3a44v5mw005lh3zsrh0salfzydl9br1n8byl1awms",
+  "url": "https://github.com/derekstride/tree-sitter-sql",
+  "rev": "70c50264ae022193adb364ffa7a767d765ed9857",
+  "date": "2022-11-02T09:36:19-04:00",
+  "path": "/nix/store/f1pg3pf4fyfmls30l1ma1nlwq61fxxqs-tree-sitter-sql",
+  "sha256": "16s58bvll2r80zga63fjzjbkfxm3zdr3vljjk69cvjwnpy668yfh",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix
index 63f749c890b4..92a755e4da6c 100644
--- a/pkgs/development/tools/parsing/tree-sitter/update.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/update.nix
@@ -31,8 +31,6 @@ let
     "tree-sitter-scala"
     "tree-sitter-ocaml"
     "tree-sitter-julia"
-    "tree-sitter-agda"
-    "tree-sitter-fluent"
     "tree-sitter-html"
     "tree-sitter-haskell"
     "tree-sitter-regex"
@@ -73,6 +71,10 @@ let
     "tree-sitter-graph"
     # abandoned
     "tree-sitter-swift"
+    # abandoned
+    "tree-sitter-agda"
+    # abandoned
+    "tree-sitter-fluent"
   ];
   ignoredTreeSitterOrgReposJson = jsonFile "ignored-tree-sitter-org-repos" ignoredTreeSitterOrgRepos;
 
@@ -137,7 +139,7 @@ let
       repo = "tree-sitter-svelte";
     };
     "tree-sitter-sql" = {
-      orga = "m-novikov";
+      orga = "derekstride";
       repo = "tree-sitter-sql";
     };
     "tree-sitter-vim" = {