Merge pull request #213298 from figsoda/sg

vimPlugins.sg-nvim: init at 2023-01-27
2023-01-29 18:41:38 -05:00 · 2023-01-29 18:41:38 -05:00 · 6c6bc2f650
commit 6c6bc2f650
parent 53c2eadd9a dc99847c04
4 changed files with 438 additions and 361 deletions
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@ -1,6 +1,6 @@
 # generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py

-{ buildGrammar, fetchCrate, fetchFromBitbucket, fetchFromGitHub, fetchFromGitLab, fetchFromGitea, fetchFromGitiles, fetchFromRepoOrCz, fetchFromSourcehut, fetchHex, fetchgit, fetchhg, fetchsvn }:
+{ buildGrammar, fetchCrate, fetchFromBitbucket, fetchFromGitHub, fetchFromGitLab, fetchFromGitea, fetchFromGitiles, fetchFromRepoOrCz, fetchFromSourcehut, fetchHex, fetchPypi, fetchgit, fetchhg, fetchsvn }:

 {
  ada = buildGrammar {
@ -71,12 +71,12 @@
  };
  beancount = buildGrammar {
    language = "beancount";
-    version = "4cbd1f0";
+    version = "c68ffc4";
    src = fetchFromGitHub {
      owner = "polarmutex";
      repo = "tree-sitter-beancount";
-      rev = "4cbd1f09cd07c1f1fabf867c2cf354f9da53cc4c";
-      hash = "sha256-Uh9/yBYXNKBvdpqNv1kr5eREYmKy3Z/kvaSZQpUl+0U=";
+      rev = "c68ffc4c6c27eadd81dd56c66f03f4d202d4b2d7";
+      hash = "sha256-MJDatUpXJMf3OB8KocA+kJi+mqNKRs7wraq33tCg3/c=";
    };
    meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount";
  };
@ -124,6 +124,17 @@
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
  };
+  capnp = buildGrammar {
+    language = "capnp";
+    version = "62057f5";
+    src = fetchFromGitHub {
+      owner = "amaanq";
+      repo = "tree-sitter-capnp";
+      rev = "62057f5d3a57ac44ca3d773623f5585b98ae2ce7";
+      hash = "sha256-EsqsYnetQBpANCrOzk1U5Tg2gfJzFSax9/ia4A8x7ic=";
+    };
+    meta.homepage = "https://github.com/amaanq/tree-sitter-capnp";
+  };
  clojure = buildGrammar {
    language = "clojure";
    version = "262d6d6";
@ -181,12 +192,12 @@
  };
  cpp = buildGrammar {
    language = "cpp";
-    version = "2d2c4ae";
+    version = "56cec4c";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-cpp";
-      rev = "2d2c4aee8672af4c7c8edff68e7dd4c07e88d2b1";
-      hash = "sha256-BjNWSTpwytOSYw32lYFItNI4t3xw+uJUx/0htYo7aLs=";
+      rev = "56cec4c2eb5d6af3d2942e69e35db15ae2433740";
+      hash = "sha256-CWh5p0tlBQizABjwBRN1VoxeEriOPhTy3lFZI9PjsTA=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp";
  };
@ -203,12 +214,12 @@
  };
  cuda = buildGrammar {
    language = "cuda";
-    version = "0091006";
+    version = "de20daa";
    src = fetchFromGitHub {
      owner = "theHamsta";
      repo = "tree-sitter-cuda";
-      rev = "0091006d6498ee5647f080ef6c09e5b95e481078";
-      hash = "sha256-t1wd32UE2Kz1VkIM4HfFFSDnttdCPGm1xOH9ZP+ATxc=";
+      rev = "de20daa547344bec47d89e55a37fb9ab0706d8cc";
+      hash = "sha256-gZctMdfwDCJEFNPKWLPr546V24clnIXUdiz4U7qISKY=";
    };
    meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda";
  };
@ -349,12 +360,12 @@
  };
  erlang = buildGrammar {
    language = "erlang";
-    version = "f0e2f78";
+    version = "2422bc9";
    src = fetchFromGitHub {
      owner = "WhatsApp";
      repo = "tree-sitter-erlang";
-      rev = "f0e2f78cdadb2e67323f9ed511656e47dcaa43bb";
-      hash = "sha256-aMgKNcIQUkwA3rrzS5+gHzzGESabCtbLa9HGXmIxT90=";
+      rev = "2422bc9373094bfa97653ac540e08759f812523c";
+      hash = "sha256-DTIA3EP2RQtts6Hl6FThSxN1SwEUbRVJJig8zOUQRCo=";
    };
    meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang";
  };
@ -459,12 +470,12 @@
  };
  gitcommit = buildGrammar {
    language = "gitcommit";
-    version = "190d288";
+    version = "f71b93f";
    src = fetchFromGitHub {
      owner = "gbprod";
      repo = "tree-sitter-gitcommit";
-      rev = "190d288a1746bddb4abe96b597fb7d17b76e5522";
-      hash = "sha256-PPdwdUfJ+2TCxVdEvexxGSBMDZmI1GW7eSfc/X3Me7Y=";
+      rev = "f71b93f399c9c2b315825827c95466e7405ec622";
+      hash = "sha256-489Rbi75XbW/IuFLijFThsI+BNXqVY1tVALwMT6yie0=";
    };
    meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit";
  };
@ -637,12 +648,12 @@
  };
  hlsl = buildGrammar {
    language = "hlsl";
-    version = "bd0d463";
+    version = "8e2f090";
    src = fetchFromGitHub {
      owner = "theHamsta";
      repo = "tree-sitter-hlsl";
-      rev = "bd0d463d1380816240a8cb1fd747fc0d3fed24aa";
-      hash = "sha256-0Dafbn0+8N1MBRyOhiaZBo7KZqm8YpFzg/ZwT3SLq+g=";
+      rev = "8e2f0907e8d2e17a88a375025e70054bafdaa8b0";
+      hash = "sha256-kBSigaBR6uM4E9uHI79gYlxBrN0E5i1zTW8syMPIQdI=";
    };
    meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl";
  };
@ -703,23 +714,23 @@
  };
  java = buildGrammar {
    language = "java";
-    version = "09d650d";
+    version = "dd597f1";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-java";
-      rev = "09d650def6cdf7f479f4b78f595e9ef5b58ce31e";
-      hash = "sha256-tGBi6gJJIPpp6oOwmAQdqBD6eaJRBRcYbWtm1BHsgBA=";
+      rev = "dd597f13eb9bab0c1bccc9aec390e8e6ebf9e0a6";
+      hash = "sha256-JeQZ4TMpt6Lfbcfc6m/PzhFZEgTdouasJ3b1sPISy2s=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-java";
  };
  javascript = buildGrammar {
    language = "javascript";
-    version = "7a29d06";
+    version = "15e85e8";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-javascript";
-      rev = "7a29d06274b7cf87d643212a433d970b73969016";
-      hash = "sha256-fMPCHdfHHyg7yNi9LDA35z+WFfPRbctrh38dZV5qZt4=";
+      rev = "15e85e80b851983fab6b12dce5a535f5a0df0f9c";
+      hash = "sha256-2SAJBnY8pmynGqB8OVqHeeAKovskO+C/XiJbLTKSlcM=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript";
  };
@ -791,23 +802,34 @@
  };
  julia = buildGrammar {
    language = "julia";
-    version = "0412178";
+    version = "9d36818";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-julia";
-      rev = "041217800bf423099015e1654c9a4fdd75310bb1";
-      hash = "sha256-DwRU4yqnMFqMIh4mAo9a57SRXhOLTnWKjO6zSaczUNU=";
+      rev = "9d368185be7e8139f2eda93d8b0acc2a54031718";
+      hash = "sha256-6jKiqDo8fSHrUGFIizNSKWoB0CVXJv6b3XfN9YjNLJc=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia";
  };
+  kdl = buildGrammar {
+    language = "kdl";
+    version = "3a67244";
+    src = fetchFromGitHub {
+      owner = "amaanq";
+      repo = "tree-sitter-kdl";
+      rev = "3a67244a48e9446248fc48117afe11dab19b030a";
+      hash = "sha256-mq+aG0C71b9OSug7chtopipVm1OJNLijmwe/PNb2ais=";
+    };
+    meta.homepage = "https://github.com/amaanq/tree-sitter-kdl";
+  };
  kotlin = buildGrammar {
    language = "kotlin";
-    version = "b953dbd";
+    version = "e463703";
    src = fetchFromGitHub {
      owner = "fwcd";
      repo = "tree-sitter-kotlin";
-      rev = "b953dbdd05257fcb2b64bc4d9c1578fac12e3c28";
-      hash = "sha256-xTbRn7bDN6FR9UOzw43RVHIahI/DFjwLGQj3cYoPurY=";
+      rev = "e4637037a5fe6f25fe66c305669faa0855f35692";
+      hash = "sha256-Xoj9RJqtyNtwag5tXRfu5iJpTnajRk1g7ClflBbFZyI=";
    };
    meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin";
  };
@ -890,24 +912,24 @@
  };
  markdown = buildGrammar {
    language = "markdown";
-    version = "16d0b5e";
+    version = "b795aa9";
    src = fetchFromGitHub {
      owner = "MDeiml";
      repo = "tree-sitter-markdown";
-      rev = "16d0b5e54d781150bea1070ffb360d47e6238659";
-      hash = "sha256-Nz9vEOV9yz3Vk8TM41clp6isViHNiko9T9mEq4NA76k=";
+      rev = "b795aa9893e4417609cf03723fe1e94e547ccfa4";
+      hash = "sha256-TfQoNPZd6OBOi/E2anJSpjLg9MwQQjix7d7rIL92SEw=";
    };
    location = "tree-sitter-markdown";
    meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
  };
  markdown_inline = buildGrammar {
    language = "markdown_inline";
-    version = "16d0b5e";
+    version = "b795aa9";
    src = fetchFromGitHub {
      owner = "MDeiml";
      repo = "tree-sitter-markdown";
-      rev = "16d0b5e54d781150bea1070ffb360d47e6238659";
-      hash = "sha256-Nz9vEOV9yz3Vk8TM41clp6isViHNiko9T9mEq4NA76k=";
+      rev = "b795aa9893e4417609cf03723fe1e94e547ccfa4";
+      hash = "sha256-TfQoNPZd6OBOi/E2anJSpjLg9MwQQjix7d7rIL92SEw=";
    };
    location = "tree-sitter-markdown-inline";
    meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
@ -947,12 +969,12 @@
  };
  nickel = buildGrammar {
    language = "nickel";
-    version = "092e901";
+    version = "d6c7eeb";
    src = fetchFromGitHub {
      owner = "nickel-lang";
      repo = "tree-sitter-nickel";
-      rev = "092e90142667482996880044d2c04837d3d1c266";
-      hash = "sha256-y0Lx6HdkoC7rOzm8fOfLBUt6672qe7AHe1SI6YY/aHE=";
+      rev = "d6c7eeb751038f934b5b1aa7ff236376d0235c56";
+      hash = "sha256-D/RRwXsWyHMxoU7Z8VVJ6jn7zUFKaKusLT/ofON7sOE=";
    };
    meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel";
  };
@ -1091,6 +1113,17 @@
    };
    meta.homepage = "https://github.com/leo60228/tree-sitter-pioasm";
  };
+  poe_filter = buildGrammar {
+    language = "poe_filter";
+    version = "80dc101";
+    src = fetchFromGitHub {
+      owner = "ObserverOfTime";
+      repo = "tree-sitter-poe-filter";
+      rev = "80dc10195e26c72598ed1ab02cdf2d8e4c792e7b";
+      hash = "sha256-KDsi8eLrTnZaD9XwyF24edmBNHre3FoTiD7RE/MpvEQ=";
+    };
+    meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-poe-filter";
+  };
  prisma = buildGrammar {
    language = "prisma";
    version = "eca2596";
@ -1269,12 +1302,12 @@
  };
  scala = buildGrammar {
    language = "scala";
-    version = "067ee61";
+    version = "b7cebd2";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-scala";
-      rev = "067ee61ff9484eac4f5bc4d57dfd007900c48f20";
-      hash = "sha256-KyxlDQla/XTBHccJG+rTqN9EO90OElZd7y21f1HTibI=";
+      rev = "b7cebd27eeb9c46082105938cae0acaaace573e3";
+      hash = "sha256-E5RwaeFmYmvEAV1W+pMNseMuVCef++xZEFssqNHrfug=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
  };
@ -1346,12 +1379,12 @@
  };
  sql = buildGrammar {
    language = "sql";
-    version = "9d98029";
+    version = "4fe05b2";
    src = fetchFromGitHub {
      owner = "derekstride";
      repo = "tree-sitter-sql";
-      rev = "9d9802991aa1d1bc00eee7713a838dab1eb4f149";
-      hash = "sha256-Iy5rqNZem1r++aI7vGITzBSFGjdDLGHFOgBWqIgKZX0=";
+      rev = "4fe05b2d81565ddb689d2f415e07afdacc515c52";
+      hash = "sha256-rfx4jBKC2zXo+zWBBb2WkFopF00KB7WHzz7LZ3M026M=";
    };
    generate = true;
    meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
@ -1450,12 +1483,12 @@
  };
  thrift = buildGrammar {
    language = "thrift";
-    version = "999a27d";
+    version = "a4e433e";
    src = fetchFromGitHub {
      owner = "duskmoon314";
      repo = "tree-sitter-thrift";
-      rev = "999a27d87b8f90a74306d4e79c5e22db3ab61633";
-      hash = "sha256-9aadAYFKeBv0gc4SHCYH+m77BB0c4qXpmg1mOeKp6mw=";
+      rev = "a4e433e7198c811d44164d50c491c82ec533dfdc";
+      hash = "sha256-Nnmg8qWxPmDvyYkWpb9GvbaJHxzCWED7h+bkI/DLSWg=";
    };
    meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift";
  };
@ -1472,12 +1505,12 @@
  };
  tlaplus = buildGrammar {
    language = "tlaplus";
-    version = "d3ef05e";
+    version = "6fd16d8";
    src = fetchFromGitHub {
      owner = "tlaplus-community";
      repo = "tree-sitter-tlaplus";
-      rev = "d3ef05eec4473094e2d691243aa243ce63de6406";
-      hash = "sha256-k5O6VheS8RBrSNk/GBjP3Qun4wY8cbPXxEFU0tCKbuU=";
+      rev = "6fd16d8469c6898317423d61738d97e2b3f5caf7";
+      hash = "sha256-s5mYc/kPZ4wHhm1ZeC5WBjBfzTFnANPRAZeE8UOVE1I=";
    };
    meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus";
  };
@ -1505,12 +1538,12 @@
  };
  tsx = buildGrammar {
    language = "tsx";
-    version = "faad909";
+    version = "5d20856";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-typescript";
-      rev = "faad9094f4061a43d4e9005439e9e85c6541ebe7";
-      hash = "sha256-8W/YX2EP3brbDsURZ8YI04KqgLOK6QqXaiFikpwrTV0=";
+      rev = "5d20856f34315b068c41edaee2ac8a100081d259";
+      hash = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ=";
    };
    location = "tsx";
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
@ -1539,24 +1572,24 @@
  };
  typescript = buildGrammar {
    language = "typescript";
-    version = "faad909";
+    version = "5d20856";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-typescript";
-      rev = "faad9094f4061a43d4e9005439e9e85c6541ebe7";
-      hash = "sha256-8W/YX2EP3brbDsURZ8YI04KqgLOK6QqXaiFikpwrTV0=";
+      rev = "5d20856f34315b068c41edaee2ac8a100081d259";
+      hash = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ=";
    };
    location = "typescript";
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
  };
  v = buildGrammar {
    language = "v";
-    version = "0b03983";
+    version = "7ef1f12";
    src = fetchFromGitHub {
      owner = "vlang";
      repo = "vls";
-      rev = "0b039830a33e759f0c9ee978b47ad10b82d37349";
-      hash = "sha256-sQxq/tWNN/aWD3ZmNhil45cnjzfy/2AXn2X/NhzvnKk=";
+      rev = "7ef1f120c1c8950c7a3e1cdffe655bdd7220321b";
+      hash = "sha256-2oVvuJsvEgv8J3abkV5ezAt0YdIkNNA4psqrcr4K+jo=";
    };
    location = "tree_sitter_v";
    meta.homepage = "https://github.com/vlang/vls";
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@ -68,6 +68,9 @@
  # nvim-treesitter dependencies
 , callPackage

+  # sg.nvim dependencies
+, darwin
+
  # sved dependencies
 , glib
 , gobject-introspection
@ -744,6 +747,34 @@ self: super: {
    ];
  });

+  sg-nvim = super.sg-nvim.overrideAttrs (old:
+    let
+      sg-nvim-rust = rustPlatform.buildRustPackage {
+        pname = "sg-nvim-rust";
+        inherit (old) version src;
+
+        cargoHash = "sha256-lrVwmJqfERq/tj4u+kRJ0kgbPQaFNAR6M3d4GqIJJyU=";
+
+        nativeBuildInputs = [ pkg-config ];
+
+        buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
+          darwin.apple_sdk.frameworks.Security
+        ];
+
+        cargoBuildFlags = [ "--workspace" ];
+
+        # tests are broken
+        doCheck = false;
+      };
+    in
+    {
+      dependencies = with self; [ plenary-nvim ];
+      postInstall = ''
+        mkdir -p $out/target/debug
+        ln -s ${sg-nvim-rust}/{bin,lib}/* $out/target/debug
+      '';
+    });
+
  skim = buildVimPluginFrom2Nix {
    pname = "skim";
    inherit (skim) version;
@ -1052,7 +1083,7 @@ self: super: {
            libiconv
          ];

-          cargoSha256 = "sha256-v9RXW5RSPMotRVR/9ljBJ9VNbrLnSkU3zlEU79Xem28=";
+          cargoSha256 = "sha256-fPVLVJXvC5blIjZ3Qyc/lxq+V+qoGrIKrXEzwdNpdHc=";
        };
      in
      ''
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -622,6 +622,7 @@ https://github.com/megaannum/self/,,
 https://github.com/jaxbot/semantic-highlight.vim/,,
 https://github.com/numirias/semshi/,,
 https://github.com/junegunn/seoul256.vim/,,
+https://github.com/tjdevries/sg.nvim/,HEAD,
 https://github.com/osyo-manga/shabadou.vim/,,
 https://github.com/AndrewRadev/sideways.vim/,,
 https://github.com/lotabout/skim.vim/,,