Unverified Commit 888764ea authored by Damien Cassou's avatar Damien Cassou Committed by GitHub
Browse files

Merge pull request #259909 from DamienCassou/treesitter-grammar-proto

parents df4a0780 632c4140

pkgs/development/tools/parsing/tree-sitter/grammars/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ 
  tree-sitter-php = lib.importJSON ./tree-sitter-php.json;

  tree-sitter-pioasm = lib.importJSON ./tree-sitter-pioasm.json;

  tree-sitter-prisma = lib.importJSON ./tree-sitter-prisma.json;

  tree-sitter-proto = lib.importJSON ./tree-sitter-proto.json;

  tree-sitter-pug = lib.importJSON ./tree-sitter-pug.json;

  tree-sitter-python = lib.importJSON ./tree-sitter-python.json;

  tree-sitter-ql = lib.importJSON ./tree-sitter-ql.json;

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-proto.json

0 → 100644
+12 −0
Original line number Diff line number Diff line 
{

  "url": "https://github.com/mitchellh/tree-sitter-proto",

  "rev": "42d82fa18f8afe59b5fc0b16c207ee4f84cb185f",

  "date": "2021-06-12T09:29:04-07:00",

  "path": "/nix/store/dsfx2jxc6nll0324pl3w6qcdv5acvyj5-tree-sitter-proto",

  "sha256": "001y2z2683fagryqj5f0gs3rcgx2nbw3x3r9afydhss80ihb8zvi",

  "hash": "sha256-cX+0YARIa9i8UymPPviyoj+Wh37AFYl9fsoNZMQXPgA=",

  "fetchLFS": false,

  "fetchSubmodules": false,

  "deepClone": false,

  "leaveDotGit": false

}

pkgs/development/tools/parsing/tree-sitter/update.nix

+39 −33
Original line number Diff line number Diff line
@@ -126,6 +126,10 @@ let 
      orga = "MDeiml";

      repo = "tree-sitter-markdown";

    };

    "tree-sitter-proto" = {

      orga = "mitchellh";

      repo = "tree-sitter-proto";

    };

    "tree-sitter-rego" = {

      orga = "FallenAngel97";

      repo = "tree-sitter-rego";
@@ -403,7 +407,8 @@ let 
  jsonFile = name: val: (formats.json { }).generate name val;



  # implementation of the updater

  updateImpl = passArgs "updateImpl-with-args" {

  updateImpl = passArgs "updateImpl-with-args"

    {

      binaries = {

        curl = "${curl}/bin/curl";

        nix-prefetch-git = "${nix-prefetch-git}/bin/nix-prefetch-git";
@@ -414,7 +419,8 @@ let 
        ignoredTreeSitterOrgRepos

        ;

    }

    (writers.writePython3 "updateImpl" {

    (writers.writePython3 "updateImpl"

      {

        flakeIgnore = [ "E501" ];

      } ./update_impl.py);