Unverified Commit 4fa29a85 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents fb4a94b3 f1d065ea

maintainers/maintainer-list.nix

+11 −6
Original line number Diff line number Diff line
@@ -2876,12 +2876,6 @@ 
    githubId = 127523;

    name = "Herman Fries";

  };

  BarinovMaxim = {

    name = "Barinov Maxim";

    email = "barinov274@gmail.com";

    github = "barinov274";

    githubId = 54442153;

  };

  BarrOff = {

    name = "BarrOff";

    github = "BarrOff";
@@ -17570,6 +17564,12 @@ 
    name = "Sean Gilligan";

    keys = [ { fingerprint = "3B66 ACFA D10F 02AA B1D5  2CB1 8DD0 D81D 7D1F C61A"; } ];

  };

  mshnwq = {

    email = "mshnwq.com@gmail.com";

    github = "mshnwq";

    githubId = 68467027;

    name = "Hayan Al-Machnouk";

  };

  msiedlarek = {

    email = "mikolaj@siedlarek.pl";

    github = "msiedlarek";
@@ -21846,6 +21846,11 @@ 
    githubId = 32239737;

    keys = [ { fingerprint = "91EB E870 1639 1323 642A  6803 B966 009D 57E6 9CC6"; } ];

  };

  rexies = {

    name = "Rexiel Scarlet";

    github = "Rexcrazy804";

    githubId = 37258415;

  };

  rexxDigital = {

    email = "joellarssonpriv@gmail.com";

    github = "rexxDigital";

pkgs/applications/editors/vim/plugins/generated.nix

+347 −347

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix

+35 −35
Original line number Diff line number Diff line
@@ -21,12 +21,12 @@ 
{

  ada = buildGrammar {

    language = "ada";

    version = "0.0.0+rev=b23672d";

    version = "0.0.0+rev=6c26c44";

    src = fetchFromGitHub {

      owner = "briot";

      repo = "tree-sitter-ada";

      rev = "b23672d313b4c994ab96fd54f1b7ff15eac68a55";

      hash = "sha256-XkJmrMppr1+1uPQwqAHcf1XBccwGexL0euXZBUX7xlM=";

      rev = "6c26c4413965dc7bacbccfa66503bf6b8228e254";

      hash = "sha256-kxm6MVUktOzH6WVKZxgGO9kFFEUXk7NFk+twidsDNM0=";

    };

    meta.homepage = "https://github.com/briot/tree-sitter-ada";

  };
@@ -330,12 +330,12 @@ 
  };

  cmake = buildGrammar {

    language = "cmake";

    version = "0.0.0+rev=cf97996";

    version = "0.0.0+rev=c7b2a71";

    src = fetchFromGitHub {

      owner = "uyha";

      repo = "tree-sitter-cmake";

      rev = "cf9799600b2ba5e6620fdabddec3b2db8306bc46";

      hash = "sha256-OxViW7H5fNc5BP072ob7GGgx1EYc6TiQEut0wHGrE1c=";

      rev = "c7b2a71e7f8ecb167fad4c97227c838439280175";

      hash = "sha256-+Lom3xjPmhhZr3G4aV054lbhLjvJsPaQalSqkKUijvU=";

    };

    meta.homepage = "https://github.com/uyha/tree-sitter-cmake";

  };
@@ -562,12 +562,12 @@ 
  };

  dot = buildGrammar {

    language = "dot";

    version = "0.0.0+rev=9ab8555";

    version = "0.0.0+rev=71e2c52";

    src = fetchFromGitHub {

      owner = "rydesun";

      repo = "tree-sitter-dot";

      rev = "9ab85550c896d8b294d9b9ca1e30698736f08cea";

      hash = "sha256-w4DInIT7mkTvQ6Hmi8yaAww6ktyNgRz0tPfBLGnOawQ=";

      rev = "71e2c5241eef9de920a4efedfefd1d527dd9a118";

      hash = "sha256-Z1XtNX1zV8xGlsaFbqh2VXPAx0fs4D7JxwqaEWSWcB0=";

    };

    meta.homepage = "https://github.com/rydesun/tree-sitter-dot";

  };
@@ -1891,12 +1891,12 @@ 
  };

  mlir = buildGrammar {

    language = "mlir";

    version = "0.0.0+rev=7eadef0";

    version = "0.0.0+rev=47c3f2c";

    src = fetchFromGitHub {

      owner = "artagnon";

      repo = "tree-sitter-mlir";

      rev = "7eadef0de98de1170cdffb68c0931e375fc1b046";

      hash = "sha256-/zOS9fvfnFotySPw2+DY9ob8s+PYJrRgb1ymx2l5JAc=";

      rev = "47c3f2cf3b10016503f2577c2d99c15bb2053402";

      hash = "sha256-1NmkSEGh6Y9BIGcdW4HrMNdqlKKfVHgcY1Amk4EKf8U=";

    };

    generate = true;

    meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
@@ -2417,12 +2417,12 @@ 
  };

  qmljs = buildGrammar {

    language = "qmljs";

    version = "0.0.0+rev=0889da4";

    version = "0.0.0+rev=0bec435";

    src = fetchFromGitHub {

      owner = "yuja";

      repo = "tree-sitter-qmljs";

      rev = "0889da4632bba3ec6f39ef4102625654890c15c1";

      hash = "sha256-Twj2taG7xFTPXTvzDcWeIqxUAkuhsybwZvtwK/HiruE=";

      rev = "0bec4359a7eb2f6c9220cd57372d87d236f66d59";

      hash = "sha256-tV4lipey+OAQwygRFp9lQAzgCNiZzSu7p3Mr6CCBH1g=";

    };

    meta.homepage = "https://github.com/yuja/tree-sitter-qmljs";

  };
@@ -2861,12 +2861,12 @@ 
  };

  sparql = buildGrammar {

    language = "sparql";

    version = "0.0.0+rev=d853661";

    version = "0.0.0+rev=1ef52d3";

    src = fetchFromGitHub {

      owner = "GordianDziwis";

      repo = "tree-sitter-sparql";

      rev = "d853661ca680d8ff7f8d800182d5782b61d0dd58";

      hash = "sha256-0BV0y8IyeIPpuxTixlJL1PsDCuhXbGaImu8JU8WFoPU=";

      rev = "1ef52d35a73a2a5f2e433ecfd1c751c1360a923b";

      hash = "sha256-9DaV12dkcwF7/jWc4QaTQaHcKu5zO5evWlXGNZMdRqc=";

    };

    meta.homepage = "https://github.com/GordianDziwis/tree-sitter-sparql";

  };
@@ -2883,12 +2883,12 @@ 
  };

  sql = buildGrammar {

    language = "sql";

    version = "0.0.0+rev=4afe285";

    version = "0.0.0+rev=d71f2bd";

    src = fetchFromGitHub {

      owner = "derekstride";

      repo = "tree-sitter-sql";

      rev = "4afe285bb142542cee0aa7b689fec00a71df4741";

      hash = "sha256-Qzrun7sIjX+jyz0oh4MotfTSXAcEYSM/2+CAWJkXgVo=";

      rev = "d71f2bd7f0e3dba84df7025fc9314738d180e71e";

      hash = "sha256-udLPpb8ihPb9mXNicwZdml2bKeIDC0RD5i7SPshrN2g=";

    };

    meta.homepage = "https://github.com/derekstride/tree-sitter-sql";

  };
@@ -2960,12 +2960,12 @@ 
  };

  superhtml = buildGrammar {

    language = "superhtml";

    version = "0.0.0+rev=aeaa0c7";

    version = "0.0.0+rev=8b5bb27";

    src = fetchFromGitHub {

      owner = "kristoff-it";

      repo = "superhtml";

      rev = "aeaa0c7d9ef983453952a2ee4983476fef0168f3";

      hash = "sha256-3mCdFn2ZsRFn/UI+frWD0MTx8qdiZldveYffpZ7nd98=";

      rev = "8b5bb272b269afdd38cdf641c4a707dd92fbe902";

      hash = "sha256-9RizfSi+ouCcLUL2+gPc8GljNo9KCX57VElLSlha05A=";

    };

    location = "tree-sitter-superhtml";

    meta.homepage = "https://github.com/kristoff-it/superhtml";
@@ -3039,25 +3039,25 @@ 
  };

  systemverilog = buildGrammar {

    language = "systemverilog";

    version = "0.0.0+rev=e88937e";

    version = "0.0.0+rev=7c4b01b";

    src = fetchFromGitHub {

      owner = "gmlarumbe";

      repo = "tree-sitter-systemverilog";

      rev = "e88937e66adc3ee7be0bfe40b7e937eafe4212bb";

      hash = "sha256-wzsjHDn6ZdGfOlufARurxCTwT8HqMvyfsnIIpXzRUYs=";

      rev = "7c4b01b7df2f6e7fa1f698c9d30ac8f93af18ed2";

      hash = "sha256-u0a8yQfFwYbAhuT8VZjKPuTfBNwAaQ0e25CcIek0thc=";

    };

    meta.homepage = "https://github.com/gmlarumbe/tree-sitter-systemverilog";

  };

  t32 = buildGrammar {

    language = "t32";

    version = "0.0.0+rev=d4e26ab";

    src = fetchFromGitLab {

    version = "0.0.0+rev=2f604ad";

    src = fetchFromGitHub {

      owner = "xasc";

      repo = "tree-sitter-t32";

      rev = "d4e26ab7a730cfbe0cf84dba6ea3647989064839";

      hash = "sha256-awbgOZaIqpdjsskSr6by2AyojVRU+gkLgS70abhPryE=";

      rev = "2f604ad17a15c09d99648199da7f173eed8250dc";

      hash = "sha256-9J8wy/7qW4vWsIzpDI+lVWr/6158jrod0nSk3ihXUPI=";

    };

    meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32";

    meta.homepage = "https://github.com/xasc/tree-sitter-t32";

  };

  tablegen = buildGrammar {

    language = "tablegen";
@@ -3542,12 +3542,12 @@ 
  };

  xresources = buildGrammar {

    language = "xresources";

    version = "0.0.0+rev=fd546d4";

    version = "0.0.0+rev=321231f";

    src = fetchFromGitHub {

      owner = "ValdezFOmar";

      repo = "tree-sitter-xresources";

      rev = "fd546d43fe0a179b59dfdfb296082c584870e11b";

      hash = "sha256-KbXPadsIADNqINBwjewDzkHHVoVhE6X0ltgWIPDGlrg=";

      rev = "321231f99e3704f1555de14cda5dca93ee14a95b";

      hash = "sha256-W7/eYAGC+usKoUdT4JgP+0d3/FykrK/lkBSvhy38qQE=";

    };

    meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources";

  };

pkgs/applications/editors/vim/plugins/overrides.nix

+1 −0
Original line number Diff line number Diff line
@@ -1614,6 +1614,7 @@ assertNoAdditions { 
      "lazyvim.plugins.extras.editor.snacks_picker"

      "lazyvim.plugins.extras.editor.telescope"

      "lazyvim.plugins.extras.formatting.prettier"

      "lazyvim.plugins.extras.lang.dotnet"

      "lazyvim.plugins.extras.lang.markdown"

      "lazyvim.plugins.extras.lang.omnisharp"

      "lazyvim.plugins.extras.lang.python"

pkgs/applications/editors/vim/plugins/vim-plugin-names

+1 −1
Original line number Diff line number Diff line
@@ -730,7 +730,7 @@ https://github.com/danymat/neogen/,HEAD, 
https://github.com/NeogitOrg/neogit/,,

https://github.com/Shougo/neoinclude.vim/,,

https://github.com/neomake/neomake/,,

https://github.com/cdmill/neomodern.nvim/,HEAD,

https://github.com/casedami/neomodern.nvim/,HEAD,

https://github.com/Shougo/neomru.vim/,,

https://github.com/neomutt/neomutt.vim/,HEAD,

https://github.com/rafamadriz/neon/,,