mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-08 05:03:40 +00:00
Merge pull request #220712 from figsoda/vim
This commit is contained in:
figsoda
GitHub
commit
08c92d1382
File diff suppressed because it is too large
Load Diff
@ -523,6 +523,17 @@
|
||||
};
|
||||
meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript";
|
||||
};
|
||||
git_config = buildGrammar {
|
||||
language = "git_config";
|
||||
version = "a01b498";
|
||||
src = fetchFromGitHub {
|
||||
owner = "the-mikedavis";
|
||||
repo = "tree-sitter-git-config";
|
||||
rev = "a01b498b25003d97a5f93b0da0e6f28307454347";
|
||||
hash = "sha256-9gLmao4zmDYj7uxrngjMa4AG9yIkKyptgaCBcL4GZYA=";
|
||||
};
|
||||
meta.homepage = "https://github.com/the-mikedavis/tree-sitter-git-config";
|
||||
};
|
||||
git_rebase = buildGrammar {
|
||||
language = "git_rebase";
|
||||
version = "d8a4207";
|
||||
@ -570,14 +581,14 @@
|
||||
};
|
||||
gleam = buildGrammar {
|
||||
language = "gleam";
|
||||
version = "cfcbca3";
|
||||
version = "ae79782";
|
||||
src = fetchFromGitHub {
|
||||
owner = "J3RN";
|
||||
owner = "gleam-lang";
|
||||
repo = "tree-sitter-gleam";
|
||||
rev = "cfcbca3f8f734773878e00d7bfcedea98eb10be2";
|
||||
hash = "sha256-lwaTlIIh4jA92ECMuxV7NtebKrjJSNoXtCe90YIQ4eE=";
|
||||
rev = "ae79782c00656945db69641378e688cdb78d52c1";
|
||||
hash = "sha256-8zxNOQnYvCHdkeyQwBGKL8fkRRinB3GUogPuw2X5n4I=";
|
||||
};
|
||||
meta.homepage = "https://github.com/J3RN/tree-sitter-gleam";
|
||||
meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam";
|
||||
};
|
||||
glimmer = buildGrammar {
|
||||
language = "glimmer";
|
||||
@ -679,6 +690,17 @@
|
||||
};
|
||||
meta.homepage = "https://github.com/slackhq/tree-sitter-hack";
|
||||
};
|
||||
hare = buildGrammar {
|
||||
language = "hare";
|
||||
version = "f0a9e62";
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaanq";
|
||||
repo = "tree-sitter-hare";
|
||||
rev = "f0a9e6207a8c84bbd11143c8eb0c6cf70dc6d8b4";
|
||||
hash = "sha256-zJxkbAzAbA3aRuSHWEF26msbVszK7OxgXP6YPZBUu8w=";
|
||||
};
|
||||
meta.homepage = "https://github.com/amaanq/tree-sitter-hare";
|
||||
};
|
||||
haskell = buildGrammar {
|
||||
language = "haskell";
|
||||
version = "0da7f82";
|
||||
@ -1280,12 +1302,12 @@
|
||||
};
|
||||
prql = buildGrammar {
|
||||
language = "prql";
|
||||
version = "5f6c4e4";
|
||||
version = "4045dcf";
|
||||
src = fetchFromGitHub {
|
||||
owner = "PRQL";
|
||||
repo = "tree-sitter-prql";
|
||||
rev = "5f6c4e4a90633b19e2077c1d37248989789d64be";
|
||||
hash = "sha256-unmRen1XJgT60lMfsIsp0PBghfBGqMoiEN9nB8Hu6gQ=";
|
||||
rev = "4045dcff3f8ac04669855b32584053dec065bba4";
|
||||
hash = "sha256-+uyCgWon/yCRAOTpzpcDovxyXrIZ4UDwwWG4ndMz0iY=";
|
||||
};
|
||||
meta.homepage = "https://github.com/PRQL/tree-sitter-prql";
|
||||
};
|
||||
@ -1346,12 +1368,12 @@
|
||||
};
|
||||
query = buildGrammar {
|
||||
language = "query";
|
||||
version = "0717de0";
|
||||
version = "e975044";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "tree-sitter-query";
|
||||
rev = "0717de07078a20a8608c98ad5f26c208949d0e15";
|
||||
hash = "sha256-dWWof8rYFTto3A4BfbKTKcNieRbwFdF6xDXW9tQvAqQ=";
|
||||
rev = "e97504446f14f529d5a8e649667d3d60391e4dfd";
|
||||
hash = "sha256-Gv882sbL2fmR++h4/I7dFCp+g6pddRCaLyX7+loEoHU=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/tree-sitter-query";
|
||||
};
|
||||
@ -1478,12 +1500,12 @@
|
||||
};
|
||||
scheme = buildGrammar {
|
||||
language = "scheme";
|
||||
version = "67b90a3";
|
||||
version = "38aef90";
|
||||
src = fetchFromGitHub {
|
||||
owner = "6cdh";
|
||||
repo = "tree-sitter-scheme";
|
||||
rev = "67b90a365bebf4406af4e5a546d6336de787e135";
|
||||
hash = "sha256-aHYOzOPK74Jd6MWFsap/k+dG+aJDTXQ05q7NoP5kfd8=";
|
||||
rev = "38aef90f54ef8f2e8e402b1f6f036ed19c636759";
|
||||
hash = "sha256-RftYAEUwqlJrOnDs1Cmz5KmJMMBz5h5m7jXpNjWjDYQ=";
|
||||
};
|
||||
meta.homepage = "https://github.com/6cdh/tree-sitter-scheme";
|
||||
};
|
||||
@ -1555,16 +1577,27 @@
|
||||
};
|
||||
sql = buildGrammar {
|
||||
language = "sql";
|
||||
version = "1cb7c7a";
|
||||
version = "b2f6b30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "derekstride";
|
||||
repo = "tree-sitter-sql";
|
||||
rev = "1cb7c7a11015983f6d173847d5a3574f8e20107b";
|
||||
hash = "sha256-zdaFE5G19MLH4W5ZF0HfRNNMJV9Evp+X70eXHDmD/pA=";
|
||||
rev = "b2f6b30ce12cbddfb663473457b670f2b3bffaa9";
|
||||
hash = "sha256-moFrlfsb1kpXFXaxRB/8Mu0XAXkQZgKlZefGj+/6NX4=";
|
||||
};
|
||||
generate = true;
|
||||
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
|
||||
};
|
||||
squirrel = buildGrammar {
|
||||
language = "squirrel";
|
||||
version = "3fefc6b";
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaanq";
|
||||
repo = "tree-sitter-squirrel";
|
||||
rev = "3fefc6b9bb2b4de1b1c461783f675918cd957546";
|
||||
hash = "sha256-gxj6HCO1ALbQWgadmR93Ot8hxkxsQuAw5D1o8f8mo48=";
|
||||
};
|
||||
meta.homepage = "https://github.com/amaanq/tree-sitter-squirrel";
|
||||
};
|
||||
starlark = buildGrammar {
|
||||
language = "starlark";
|
||||
version = "8ad93a7";
|
||||
@ -1780,6 +1813,17 @@
|
||||
};
|
||||
meta.homepage = "https://github.com/Philipp-M/tree-sitter-ungrammar";
|
||||
};
|
||||
uxntal = buildGrammar {
|
||||
language = "uxntal";
|
||||
version = "14e4760";
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaanq";
|
||||
repo = "tree-sitter-uxntal";
|
||||
rev = "14e47600afef0affffcbfbe1543381b1ac8fbc5c";
|
||||
hash = "sha256-SgBWJ8b/9kMkSDafx+6eSl+FS4Hkd1Ei2ALhTLL7yRk=";
|
||||
};
|
||||
meta.homepage = "https://github.com/amaanq/tree-sitter-uxntal";
|
||||
};
|
||||
v = buildGrammar {
|
||||
language = "v";
|
||||
version = "66cf9d3";
|
||||
@ -1893,12 +1937,12 @@
|
||||
};
|
||||
yuck = buildGrammar {
|
||||
language = "yuck";
|
||||
version = "48af129";
|
||||
version = "c348825";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Philipp-M";
|
||||
repo = "tree-sitter-yuck";
|
||||
rev = "48af129ab5411cd6f7ae2b36f53c1192572fa030";
|
||||
hash = "sha256-G/aY771G7R78FhS7WxktlMf/0K+PR80WqfwmH+gQhwQ=";
|
||||
rev = "c348825d3f86dec71dee0e1223c6bd73114e3579";
|
||||
hash = "sha256-H4tsLDo9Egp1mpZGcA5Z9C9wPFNxPEBDTugUYKeYW9I=";
|
||||
};
|
||||
meta.homepage = "https://github.com/Philipp-M/tree-sitter-yuck";
|
||||
};
|
||||
|
||||
@ -831,6 +831,19 @@ self: super: {
|
||||
propagatedBuildInputs = [ sniprun-bin ];
|
||||
};
|
||||
|
||||
# The GitHub repository returns 404, which breaks the update script
|
||||
Spacegray-vim = buildVimPluginFrom2Nix {
|
||||
pname = "Spacegray.vim";
|
||||
version = "2021-07-06";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ackyshake";
|
||||
repo = "Spacegray.vim";
|
||||
rev = "c699ca10ed421c462bd1c87a158faaa570dc8e28";
|
||||
sha256 = "0ma8w6p5jh6llka49x5j5ql8fmhv0bx5hhsn5b2phak79yqg1k61";
|
||||
};
|
||||
meta.homepage = "https://github.com/ackyshake/Spacegray.vim/";
|
||||
};
|
||||
|
||||
sqlite-lua = super.sqlite-lua.overrideAttrs (old: {
|
||||
postPatch = let
|
||||
libsqlite = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
@ -1105,7 +1118,7 @@ self: super: {
|
||||
libiconv
|
||||
];
|
||||
|
||||
cargoSha256 = "sha256-MR9n2+B2TUNnWxZhBbXZCBereLxYntBxLfx9g14vDUw=";
|
||||
cargoHash = "sha256-BFUC6fQ5LpTKx2ztCuFVzXTWzSDl03VYsmVcxBXbiT4=";
|
||||
};
|
||||
in
|
||||
''
|
||||
@ -1333,6 +1346,19 @@ self: super: {
|
||||
};
|
||||
});
|
||||
|
||||
# The GitHub repository returns 404, which breaks the update script
|
||||
VimCompletesMe = buildVimPluginFrom2Nix {
|
||||
pname = "VimCompletesMe";
|
||||
version = "2022-02-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ackyshake";
|
||||
repo = "VimCompletesMe";
|
||||
rev = "9adf692d7ae6424038458a89d4a411f0a27d1388";
|
||||
sha256 = "1sndgb3291dyifaa8adri2mb8cgbinbar3nw1fnf67k9ahwycaz0";
|
||||
};
|
||||
meta.homepage = "https://github.com/ackyshake/VimCompletesMe/";
|
||||
};
|
||||
|
||||
vimsence = super.vimsence.overrideAttrs (old: {
|
||||
meta = with lib; {
|
||||
description = "Discord rich presence for Vim";
|
||||
@ -1357,15 +1383,6 @@ self: super: {
|
||||
dependencies = with self; [ vimproc-vim ];
|
||||
});
|
||||
|
||||
vim-trailing-whitespace = super.vim-trailing-whitespace.overrideAttrs (old: {
|
||||
patches = [(fetchpatch {
|
||||
# https://github.com/bronson/vim-trailing-whitespace/pull/30
|
||||
name = "fix-add-dynamic-TerminalOpen-for-both-vim-and-nvim.patch";
|
||||
url = "https://github.com/bronson/vim-trailing-whitespace/commit/99ef803ebdc01d62b418a3e9386d5f10797bfac3.patch";
|
||||
hash = "sha256-cyanHUKxhbY8c6EkAbpUq7QcEBQABCwZ6NoEUOpd2F8=";
|
||||
})];
|
||||
});
|
||||
|
||||
vim-zettel = super.vim-zettel.overrideAttrs (old: {
|
||||
dependencies = with self; [ vimwiki fzf-vim ];
|
||||
});
|
||||
|
||||
@ -29,9 +29,7 @@ https://github.com/vim-scripts/ShowMultiBase/,,
|
||||
https://github.com/tmhedberg/SimpylFold/,,
|
||||
https://github.com/jaredgorski/SpaceCamp/,,
|
||||
https://github.com/SpaceVim/SpaceVim/,,
|
||||
https://github.com/ackyshake/Spacegray.vim/,,
|
||||
https://github.com/chrisbra/SudoEdit.vim/,,
|
||||
https://github.com/ackyshake/VimCompletesMe/,,
|
||||
https://github.com/hsitz/VimOrganizer/,,
|
||||
https://github.com/VundleVim/Vundle.vim/,,
|
||||
https://github.com/esneider/YUNOcommit.vim/,,
|
||||
@ -476,7 +474,6 @@ https://github.com/tjdevries/nlua.nvim/,,
|
||||
https://github.com/mcchrish/nnn.vim/,,
|
||||
https://github.com/shortcuts/no-neck-pain.nvim/,HEAD,
|
||||
https://github.com/folke/noice.nvim/,HEAD,
|
||||
https://github.com/arcticicestudio/nord-vim/,,
|
||||
https://github.com/shaunsingh/nord.nvim/,,
|
||||
https://github.com/andersevenrud/nordic.nvim/,,
|
||||
https://github.com/jlesquembre/nterm.nvim/,,
|
||||
@ -756,6 +753,7 @@ https://github.com/junegunn/vader.vim/,,
|
||||
https://github.com/jbyuki/venn.nvim/,,
|
||||
https://github.com/vhda/verilog_systemverilog.vim/,,
|
||||
https://github.com/vifm/vifm.vim/,,
|
||||
https://github.com/nordtheme/vim/,,nord-vim
|
||||
https://github.com/dracula/vim/,,dracula-vim
|
||||
https://github.com/embark-theme/vim/,,embark-vim
|
||||
https://github.com/catppuccin/vim/,HEAD,catppuccin-vim
|
||||
|
||||
Loading…
Reference in New Issue
Block a user