MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 15:22:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

neovimUtils.buildNeovimPluginFrom2Nix: rename to buildNeovimPlugin

Browse source 
buildNeovimPluginFrom2Nix was cargo-culted from buildVimPluginFrom2Nix
but this doesn't make sense.
From2Nix referred to a way of building plugins that is not used anymore
so buildVimPluginFrom2Nix could be renamed too.
This commit is contained in:
Matthieu Coudron 2023-06-11 21:36:38 +02:00 committed by Matthieu Coudron
parent e94ae32f3a
commit 8255903b71
5 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/editors/neovim/utils.nix
View file

@ -193,14 +193,16 @@ let
in
lib.concatStringsSep ";" hostProviderLua;
buildNeovimPlugin = callPackage ./build-neovim-plugin.nix {
inherit (vimUtils) toVimPlugin;
inherit lua;
};
in
{
inherit makeNeovimConfig;
inherit generateProviderRc;
inherit legacyWrapper;
buildNeovimPluginFrom2Nix = callPackage ./build-neovim-plugin.nix {
inherit (vimUtils) toVimPlugin;
inherit lua;
};
inherit buildNeovimPlugin;
buildNeovimPluginFrom2Nix = lib.warn "buildNeovimPluginFrom2Nix was renamed to buildNeovimPlugin" buildNeovimPlugin;
}

2
pkgs/applications/editors/vim/plugins/default.nix
View file

@ -15,7 +15,7 @@ let
plugins = callPackage ./generated.nix {
inherit buildVimPluginFrom2Nix;
inherit (neovimUtils) buildNeovimPluginFrom2Nix;
inherit (neovimUtils) buildNeovimPlugin;
};
# TL;DR

18
pkgs/applications/editors/vim/plugins/generated.nix
View file

@ -1,5 +1,5 @@
# GENERATED by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!
{ lib, buildVimPluginFrom2Nix, buildNeovimPluginFrom2Nix, fetchFromGitHub, fetchgit }:
{ lib, buildVimPluginFrom2Nix, buildNeovimPlugin, fetchFromGitHub, fetchgit }:
final: prev:
{
@ -3598,7 +3598,7 @@ final: prev:
meta.homepage = "https://github.com/ruifm/gitlinker.nvim/";
};
gitsigns-nvim = buildNeovimPluginFrom2Nix {
gitsigns-nvim = buildNeovimPlugin {
pname = "gitsigns.nvim";
version = "2023-06-07";
src = fetchFromGitHub {
@ -3861,7 +3861,7 @@ final: prev:
meta.homepage = "https://github.com/ThePrimeagen/harpoon/";
};
haskell-tools-nvim = buildNeovimPluginFrom2Nix {
haskell-tools-nvim = buildNeovimPlugin {
pname = "haskell-tools.nvim";
version = "2023-06-05";
src = fetchFromGitHub {
@ -5013,7 +5013,7 @@ final: prev:
meta.homepage = "https://github.com/alvarosevilla95/luatab.nvim/";
};
lush-nvim = buildNeovimPluginFrom2Nix {
lush-nvim = buildNeovimPlugin {
pname = "lush.nvim";
version = "2023-06-08";
src = fetchFromGitHub {
@ -6369,7 +6369,7 @@ final: prev:
meta.homepage = "https://github.com/roxma/nvim-cm-racer/";
};
nvim-cmp = buildNeovimPluginFrom2Nix {
nvim-cmp = buildNeovimPlugin {
pname = "nvim-cmp";
version = "2023-06-10";
src = fetchFromGitHub {
@ -7605,7 +7605,7 @@ final: prev:
meta.homepage = "https://github.com/nvim-treesitter/playground/";
};
plenary-nvim = buildNeovimPluginFrom2Nix {
plenary-nvim = buildNeovimPlugin {
pname = "plenary.nvim";
version = "2023-06-10";
src = fetchFromGitHub {
@ -7943,7 +7943,7 @@ final: prev:
meta.homepage = "https://github.com/filipdutescu/renamer.nvim/";
};
rest-nvim = buildNeovimPluginFrom2Nix {
rest-nvim = buildNeovimPlugin {
pname = "rest.nvim";
version = "2023-06-07";
src = fetchFromGitHub {
@ -9016,7 +9016,7 @@ final: prev:
meta.homepage = "https://github.com/gbrlsnchs/telescope-lsp-handlers.nvim/";
};
telescope-manix = buildNeovimPluginFrom2Nix {
telescope-manix = buildNeovimPlugin {
pname = "telescope-manix";
version = "2023-06-05";
src = fetchFromGitHub {
@ -9149,7 +9149,7 @@ final: prev:
meta.homepage = "https://github.com/jvgrootveld/telescope-zoxide/";
};
telescope-nvim = buildNeovimPluginFrom2Nix {
telescope-nvim = buildNeovimPlugin {
pname = "telescope.nvim";
version = "2023-06-10";
src = fetchFromGitHub {

4
pkgs/applications/editors/vim/plugins/get-plugins.nix
View file

@ -1,10 +1,10 @@
with import <localpkgs> {};
let
inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix;
inherit (neovimUtils) buildNeovimPluginFrom2Nix;
inherit (neovimUtils) buildNeovimPlugin;
generated = callPackage <localpkgs/pkgs/applications/editors/vim/plugins/generated.nix> {
inherit buildNeovimPluginFrom2Nix buildVimPluginFrom2Nix;
inherit buildNeovimPlugin buildVimPluginFrom2Nix;
} {} {};
hasChecksum = value:
lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value;

4
pkgs/applications/editors/vim/plugins/update.py
View file

@ -74,7 +74,7 @@ class VimEditor(pluginupdate.Editor):
with open(outfile, "w+") as f:
f.write(HEADER)
f.write(textwrap.dedent("""
{ lib, buildVimPluginFrom2Nix, buildNeovimPluginFrom2Nix, fetchFromGitHub, fetchgit }:
{ lib, buildVimPluginFrom2Nix, buildNeovimPlugin, fetchFromGitHub, fetchgit }:
final: prev:
{
@ -103,7 +103,7 @@ class VimEditor(pluginupdate.Editor):
}};
""".format(
buildFn="buildNeovimPluginFrom2Nix" if isNeovim else "buildVimPluginFrom2Nix", plugin=plugin, src_nix=src_nix, repo=repo)
buildFn="buildNeovimPlugin" if isNeovim else "buildVimPluginFrom2Nix", plugin=plugin, src_nix=src_nix, repo=repo)
log.debug(content)
return content