From fbe613e1f1ba0ebb44005a907608db382988cf86 Mon Sep 17 00:00:00 2001 From: Riley Bruins Date: Mon, 16 Sep 2024 09:46:01 -0700 Subject: [PATCH] tree-sitter-grammars.tree-sitter-wing: update source repo The repo for this tree-sitter grammar was changed a while back and not reflected here, which broke emacsPackages.treesit-grammars.with-all-grammars. Fixes #342344. --- .../tools/parsing/tree-sitter/default.nix | 3 +-- .../tree-sitter/grammars/tree-sitter-wing.json | 12 ++++++------ .../development/tools/parsing/tree-sitter/update.nix | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 0caa514c913b..28fda605fab6 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -72,8 +72,7 @@ let { tree-sitter-markdown = grammars'.tree-sitter-markdown // { location = "tree-sitter-markdown"; }; } // { tree-sitter-markdown-inline = grammars'.tree-sitter-markdown // { language = "markdown_inline"; location = "tree-sitter-markdown-inline"; }; } // { tree-sitter-php = grammars'.tree-sitter-php // { location = "php"; }; } // - { tree-sitter-sql = grammars'.tree-sitter-sql // { generate = true; }; } // - { tree-sitter-wing = grammars'.tree-sitter-wing // { location = "libs/tree-sitter-wing"; generate = true; }; }; + { tree-sitter-sql = grammars'.tree-sitter-sql // { generate = true; }; }; in lib.mapAttrs build (grammars); diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json index 940beec1353b..71879d700f85 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json @@ -1,10 +1,10 @@ { - "url": "https://github.com/winglang/wing", - "rev": "ae30eb63ed5dba548d8935e0d3c74bfb28f0d690", - "date": "2024-09-16T08:46:38Z", - "path": "/nix/store/zczqrkbqiw0k8qd7an1bk93cksyd05nr-wing", - "sha256": "032j48xy59z9d80xhy14jb1vca2pxk3cv5a5myqmfnlik2c8frj2", - "hash": "sha256-QmaHmJiRWlexr0WVzcbsVyi2w5IkeNgBaumn4jsiUgw=", + "url": "https://github.com/winglang/tree-sitter-wing", + "rev": "27b595f5ea1aa45b5f777f194c0bd121a7b0c8e3", + "date": "2024-09-03T18:25:03-04:00", + "path": "/nix/store/az77v8z742hkqm830lvhgnqi1zpx9v8d-tree-sitter-wing", + "sha256": "09h79hvi35riwypskhh97qz8wis2kkz27xj777fg8lldvfh5kgdh", + "hash": "sha256-sL1ZoNuNUvTcOUf2I/6cQkeOPj4Jwqmv5zGXETdMByY=", "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 4c21402a4b2f..aa1504f57c7b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -423,7 +423,7 @@ let }; "tree-sitter-wing" = { orga = "winglang"; - repo = "wing"; + repo = "tree-sitter-wing"; }; "tree-sitter-wgsl" = { orga = "szebniok";