diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-18 18:01:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-18 18:01:12 +0000 |
| commit | e15af378fb53182b63f645c34e4f01cc5879912c (patch) | |
| tree | 72650c051dc28267eacc3c6459c748536f3aad62 /pkgs/misc | |
| parent | 829200bc5a3dd290b1128cea35e2a6f1c94a0047 (diff) | |
| parent | eb0aa6ea31ea14724a5c8b6c10f3d9b282d77461 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/vim-plugins/generated.nix | 12 | ||||
| -rw-r--r-- | pkgs/misc/vim-plugins/overrides.nix | 4 | ||||
| -rw-r--r-- | pkgs/misc/vim-plugins/vim-plugin-names | 1 |
3 files changed, 17 insertions, 0 deletions
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index d6465324bda52..a38ed64540f5b 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -3442,6 +3442,18 @@ final: prev: meta.homepage = "https://github.com/jlesquembre/nterm.nvim/"; }; + null-ls-nvim = buildVimPluginFrom2Nix { + pname = "null-ls-nvim"; + version = "2021-07-14"; + src = fetchFromGitHub { + owner = "jose-elias-alvarez"; + repo = "null-ls.nvim"; + rev = "56d4b76203d2b442353e25c247f49fa5ca70f42e"; + sha256 = "0kmgln5ra2lpdvj9866a11l9h04zc1dmvxcw8gbra6f72ars3jwr"; + }; + meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; + }; + numb-nvim = buildVimPluginFrom2Nix { pname = "numb-nvim"; version = "2021-07-12"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 0cf3222c9f36b..8ee937359cb50 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -399,6 +399,10 @@ self: super: { dependencies = with self; [ plenary-nvim ]; }); + null-ls-nvim = super.null-ls-nvim.overrideAttrs (old: { + path = "null-ls.nvim"; + }); + nvim-lsputils = super.nvim-lsputils.overrideAttrs (old: { dependencies = with self; [ popfix ]; }); diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 8aaa0c8f31d63..c639dcc4d1d9b 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -258,6 +258,7 @@ jonsmithers/vim-html-template-literals joonty/vim-xdebug josa42/coc-lua josa42/vim-lightline-coc +jose-elias-alvarez/null-ls.nvim@main joshdick/onedark.vim@main jpalardy/vim-slime@main jparise/vim-graphql |