vimPlugins: do not pick up aliases from nixpkgs

This commit is contained in:
Jörg Thalheim 2018-09-12 07:51:03 +01:00
parent 4daba543aa
commit ac415ca68e
3 changed files with 76 additions and 74 deletions

View file

@ -334,7 +334,7 @@ self = generated // (with generated; {
}) // lib.optionalAttrs (config.allowAliases or true) (with self; {
# aliases
airline = vim-airline;
a-vim = alternative; # backwards compat, added 2018-09-10
alternative = a-vim; # backwards compat, added 2014-10-21
bats = bats-vim;
calendar = calendar-vim;
coffee-script = vim-coffee-script;
@ -343,8 +343,9 @@ self = generated // (with generated; {
solarized = vim-colors-solarized;
colors-solarized = vim-colors-solarized;
caw = caw-vim;
Colour_Sampler_Pack = colorsamplerpack;
command-t = command_T; # backwards compat, added 2018-09-10
colorsamplerpack = Colour_Sampler_Pack;
Colour_Sampler_Pack = Colour-Sampler-Pack;
command_T = command-t; # backwards compat, added 2014-10-18
commentary = vim-commentary;
committia = committia-vim;
concealedyank = concealedyank-vim;
@ -381,7 +382,7 @@ self = generated // (with generated; {
latex-live-preview = vim-latex-live-preview;
maktaba = vim-maktaba;
multiple-cursors = vim-multiple-cursors;
neco-ghc = necoGhc; # backwards compat, added 2018-09-10
necoGhc = neco-ghc; # backwards compat, added 2014-10-18
neocomplete = neocomplete-vim;
neoinclude = neoinclude-vim;
neomru = neomru-vim;
@ -426,12 +427,12 @@ self = generated // (with generated; {
vim-addon-vim2nix = vim2nix;
vimproc = vimproc-vim;
vimshell = vimshell-vim;
vim-vinegar = vinegar; # backwards compat, added 2018-09-10
vim-watchdogs = watchdogs; # backwards compat, added 2018-09-10
vinegar = vim-vinegar;
watchdogs = vim-watchdogs;
WebAPI = webapi-vim;
wombat256 = wombat256-vim; # backwards compat, added 2015-7-8
YankRing-vim = yankring;
Yankring = yankring;
yankring = YankRing-vim;
Yankring = YankRing-vim;
YouCompleteMe = youcompleteme;
xterm-color-table = xterm-color-table-vim;
zeavim = zeavim-vim;

View file

@ -2,6 +2,16 @@
{ buildVimPluginFrom2Nix, fetchFromGitHub }:
{
a-vim = buildVimPluginFrom2Nix {
name = "a-vim-2010-11-06";
src = fetchFromGitHub {
owner = "vim-scripts";
repo = "a.vim";
rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885";
sha256 = "0h62v9z5bh9xmaq22pqdb3z79i84a5rknqm68mjpy7nq7s3q42fa";
};
};
ack-vim = buildVimPluginFrom2Nix {
name = "ack-vim-2018-02-27";
src = fetchFromGitHub {
@ -62,16 +72,6 @@
};
};
alternative = buildVimPluginFrom2Nix {
name = "alternative-2010-11-06";
src = fetchFromGitHub {
owner = "vim-scripts";
repo = "a.vim";
rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885";
sha256 = "0h62v9z5bh9xmaq22pqdb3z79i84a5rknqm68mjpy7nq7s3q42fa";
};
};
argtextobj-vim = buildVimPluginFrom2Nix {
name = "argtextobj-vim-2010-10-18";
src = fetchFromGitHub {
@ -182,8 +182,8 @@
};
};
colorsamplerpack = buildVimPluginFrom2Nix {
name = "colorsamplerpack-2012-11-30";
Colour-Sampler-Pack = buildVimPluginFrom2Nix {
name = "Colour-Sampler-Pack-2012-11-30";
src = fetchFromGitHub {
owner = "vim-scripts";
repo = "Colour-Sampler-Pack";
@ -192,8 +192,8 @@
};
};
command_T = buildVimPluginFrom2Nix {
name = "command_T-2017-11-17";
command-t = buildVimPluginFrom2Nix {
name = "command-t-2017-11-17";
src = fetchFromGitHub {
owner = "wincent";
repo = "command-t";
@ -293,16 +293,6 @@
};
};
ctrlp-vim = buildVimPluginFrom2Nix {
name = "ctrlp-vim-2018-06-28";
src = fetchFromGitHub {
owner = "ctrlpvim";
repo = "ctrlp.vim";
rev = "43cc73b8e7d4ab45f17118573eb81fd45704b989";
sha256 = "16jn9n6vavwiwh6l2av2i3livan72saaz0d0v8vmznrrs2ngi1gk";
};
};
ctrlp-z = buildVimPluginFrom2Nix {
name = "ctrlp-z-2015-10-17";
src = fetchFromGitHub {
@ -313,6 +303,16 @@
};
};
ctrlp-vim = buildVimPluginFrom2Nix {
name = "ctrlp-vim-2018-06-28";
src = fetchFromGitHub {
owner = "ctrlpvim";
repo = "ctrlp.vim";
rev = "43cc73b8e7d4ab45f17118573eb81fd45704b989";
sha256 = "16jn9n6vavwiwh6l2av2i3livan72saaz0d0v8vmznrrs2ngi1gk";
};
};
denite-extra = buildVimPluginFrom2Nix {
name = "denite-extra-2018-08-13";
src = fetchFromGitHub {
@ -396,16 +396,6 @@
};
};
deoplete-nvim = buildVimPluginFrom2Nix {
name = "deoplete-nvim-2018-09-02";
src = fetchFromGitHub {
owner = "shougo";
repo = "deoplete.nvim";
rev = "8c2117b966a7f05091cd49609f8ee3641f260997";
sha256 = "0pklmb89g3hqxilv0546c21yjav26frsxb5g24ma49pii8lmzgjg";
};
};
deoplete-rust = buildVimPluginFrom2Nix {
name = "deoplete-rust-2017-07-18";
src = fetchFromGitHub {
@ -426,6 +416,16 @@
};
};
deoplete-nvim = buildVimPluginFrom2Nix {
name = "deoplete-nvim-2018-09-02";
src = fetchFromGitHub {
owner = "shougo";
repo = "deoplete.nvim";
rev = "8c2117b966a7f05091cd49609f8ee3641f260997";
sha256 = "0pklmb89g3hqxilv0546c21yjav26frsxb5g24ma49pii8lmzgjg";
};
};
dhall-vim = buildVimPluginFrom2Nix {
name = "dhall-vim-2018-07-30";
src = fetchFromGitHub {
@ -778,6 +778,16 @@
};
};
neco-ghc = buildVimPluginFrom2Nix {
name = "neco-ghc-2018-05-13";
src = fetchFromGitHub {
owner = "eagletmt";
repo = "neco-ghc";
rev = "682869aca5dd0bde71a09ba952acb59c543adf7d";
sha256 = "1v7ibi4fp99s4lswz3v0gf4i0h5i5gpj05xpsf4cixwj2zgh206h";
};
};
neco-look = buildVimPluginFrom2Nix {
name = "neco-look-2018-01-21";
src = fetchFromGitHub {
@ -808,16 +818,6 @@
};
};
necoGhc = buildVimPluginFrom2Nix {
name = "necoGhc-2018-05-13";
src = fetchFromGitHub {
owner = "eagletmt";
repo = "neco-ghc";
rev = "682869aca5dd0bde71a09ba952acb59c543adf7d";
sha256 = "1v7ibi4fp99s4lswz3v0gf4i0h5i5gpj05xpsf4cixwj2zgh206h";
};
};
neocomplete-vim = buildVimPluginFrom2Nix {
name = "neocomplete-vim-2018-03-28";
src = fetchFromGitHub {
@ -2909,6 +2909,16 @@
};
};
vim-vinegar = buildVimPluginFrom2Nix {
name = "vim-vinegar-2018-08-06";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-vinegar";
rev = "c38ea2195a43747aedf0bb4b7eb5aa8870260296";
sha256 = "1bcpi4m7ng9jaipf8xjf74469lgk34bs5ajjpv9dnkcrsalm28nf";
};
};
vim-visualstar = buildVimPluginFrom2Nix {
name = "vim-visualstar-2015-08-27";
src = fetchFromGitHub {
@ -2929,6 +2939,16 @@
};
};
vim-watchdogs = buildVimPluginFrom2Nix {
name = "vim-watchdogs-2017-12-03";
src = fetchFromGitHub {
owner = "osyo-manga";
repo = "vim-watchdogs";
rev = "a6415c2d928af8c1aacdbce9b1ed8d315891eb03";
sha256 = "0n6aqsgn0q1qgpj4yznqwbsbbk2a077gnjlq86ii3jhkzh5fzcff";
};
};
vim-wordy = buildVimPluginFrom2Nix {
name = "vim-wordy-2018-03-10";
src = fetchFromGitHub {
@ -3039,16 +3059,6 @@
};
};
vinegar = buildVimPluginFrom2Nix {
name = "vinegar-2018-08-06";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-vinegar";
rev = "c38ea2195a43747aedf0bb4b7eb5aa8870260296";
sha256 = "1bcpi4m7ng9jaipf8xjf74469lgk34bs5ajjpv9dnkcrsalm28nf";
};
};
vundle = buildVimPluginFrom2Nix {
name = "vundle-2018-02-03";
src = fetchFromGitHub {
@ -3059,16 +3069,6 @@
};
};
watchdogs = buildVimPluginFrom2Nix {
name = "watchdogs-2017-12-03";
src = fetchFromGitHub {
owner = "osyo-manga";
repo = "vim-watchdogs";
rev = "a6415c2d928af8c1aacdbce9b1ed8d315891eb03";
sha256 = "0n6aqsgn0q1qgpj4yznqwbsbbk2a077gnjlq86ii3jhkzh5fzcff";
};
};
webapi-vim = buildVimPluginFrom2Nix {
name = "webapi-vim-2018-03-14";
src = fetchFromGitHub {
@ -3109,8 +3109,8 @@
};
};
yankring = buildVimPluginFrom2Nix {
name = "yankring-2015-07-29";
YankRing-vim = buildVimPluginFrom2Nix {
name = "YankRing-vim-2015-07-29";
src = fetchFromGitHub {
owner = "vim-scripts";
repo = "YankRing.vim";

View file

@ -139,6 +139,7 @@ def prefetch_plugin(user: str, repo_name: str, cache: "Cache") -> Plugin:
has_submodules = repo.has_submodules()
cached_plugin = cache[commit]
if cached_plugin is not None:
cached_plugin.name = repo_name
cached_plugin.date = date
return cached_plugin