@@ -1,10 +1,9 @@
1−{config, lib, stdenv
2−, python, cmake, vim, vimUtils, ruby
1+{ lib, stdenv
2+, python, cmake, vim, ruby
33, which, fetchgit, llvmPackages, rustPlatform
44, xkb_switch, fzf, skim
55, python3, boost, icu, ncurses
66, ycmd, rake
7−, pythonPackages, python3Packages
87, substituteAll
98, languagetool
109, Cocoa, CoreFoundation, CoreServices
@@ -17,50 +16,22 @@
1716, impl, iferr, gocode, gocode-gomod, go-tools
1817}:
1918
20−let
21−
22− _skim = skim;
23−
24−in
25−
26−generated:
27−
28−rec {
29−
30− # list of plugins that are needed as dependencies somewhere
31− # This is necessary (as opposed to `with generated;`) because
32− # there would otherwise be conflicts with `rec`. `rec` is necessary
33− # however to make sure overriden plugins can be used as dependencies.
34− # This should use a proper package set with fixed-points instead.
35− inherit (generated)
36− self
37− webapi-vim
38− nvim-yarp
39− ultisnips
40− vim-addon-mw-utils
41− tlib_vim
42− vim-addon-signs
43− vim-addon-other
44− vim-addon-errorformats
45− vim-maktaba
46− vim-misc;
19+self: super: {
4720
4821 vim2nix = buildVimPluginFrom2Nix {
4922 name = "vim2nix";
5023 src = ./vim2nix;
51− dependencies = [ vim-addon-manager ];
24+ dependencies = with super; [ vim-addon-manager ];
5225 };
5326
5427 fzfWrapper = buildVimPluginFrom2Nix {
5528 name = fzf.name;
5629 src = fzf.src;
57− dependencies = [];
5830 };
5931
6032 skim = buildVimPluginFrom2Nix {
61− name = _skim.name;
62− src = _skim.vim;
63− dependencies = [];
33+ name = skim.name;
34+ src = skim.vim;
6435 };
6536
6637 LanguageClient-neovim = let
@@ -86,7 +57,6 @@ rec {
8657 name = "LanguageClient-neovim-2018-09-07";
8758 src = LanguageClient-neovim-src;
8859
89− dependencies = [];
9060 propogatedBuildInputs = [ LanguageClient-neovim-bin ];
9161
9262 preFixup = ''
@@ -103,10 +73,9 @@ rec {
10373 rev = "69cce66defdf131958f152ea7a7b26c21ca9d009";
10474 sha256 = "1363b2fmv69axrl2hm74dmx51cqd8k7rk116890qllnapzw1zjgc";
10575 };
106− dependencies = [];
10776 };
10877
109− clang_complete = generated.clang_complete.overrideAttrs(old: {
78+ clang_complete = super.clang_complete.overrideAttrs(old: {
11079 # In addition to the arguments you pass to your compiler, you also need to
11180 # specify the path of the C++ std header (if you are using C++).
11281 # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper).
@@ -123,14 +92,14 @@ rec {
12392 '';
12493 });
12594
126− clighter8 = generated.clighter8.overrideAttrs(old: {
95+ clighter8 = super.clighter8.overrideAttrs(old: {
12796 preFixup = ''
12897 sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc.lib}/lib/libclang.so')|" \
12998 -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim
13099 '';
131100 });
132101
133− command-t = generated.command-t.overrideAttrs(old: {
102+ command-t = super.command-t.overrideAttrs(old: {
134103 buildInputs = [ ruby rake ];
135104 buildPhase = ''
136105 rake make
@@ -138,7 +107,7 @@ rec {
138107 '';
139108 });
140109
141− cpsm = generated.cpsm.overrideAttrs(old: {
110+ cpsm = super.cpsm.overrideAttrs(old: {
142111 buildInputs = [
143112 python3
144113 stdenv
@@ -154,7 +123,7 @@ rec {
154123 '';
155124 });
156125
157− ctrlp-cmatcher = generated.ctrlp-cmatcher.overrideAttrs(old: {
126+ ctrlp-cmatcher = super.ctrlp-cmatcher.overrideAttrs(old: {
158127 buildInputs = [ python ];
159128 buildPhase = ''
160129 patchShebangs .
@@ -162,7 +131,7 @@ rec {
162131 '';
163132 });
164133
165− deoplete-go = generated.deoplete-go.overrideAttrs(old: {
134+ deoplete-go = super.deoplete-go.overrideAttrs(old: {
166135 buildInputs = [ python3 ];
167136 buildPhase = ''
168137 pushd ./rplugin/python3/deoplete/ujson
@@ -172,33 +141,33 @@ rec {
172141 '';
173142 });
174143
175− ensime-vim = generated.ensime-vim.overrideAttrs(old: {
144+ ensime-vim = super.ensime-vim.overrideAttrs(old: {
176145 passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ];
177− dependencies = [ vimproc-vim vimshell-vim self forms ];
146+ dependencies = with super; [ vimproc-vim vimshell-vim super.self forms ];
178147 });
179148
180− forms = generated.forms.overrideAttrs(old: {
181− dependencies = [ self ];
149+ forms = super.forms.overrideAttrs(old: {
150+ dependencies = with super; [ super.self ];
182151 });
183152
184− gist-vim = generated.gist-vim.overrideAttrs(old: {
185− dependencies = [ webapi-vim ];
153+ gist-vim = super.gist-vim.overrideAttrs(old: {
154+ dependencies = with super; [ webapi-vim ];
186155 });
187156
188− ncm2 = generated.ncm2.overrideAttrs(old: {
189− dependencies = [ nvim-yarp ];
157+ ncm2 = super.ncm2.overrideAttrs(old: {
158+ dependencies = with super; [ nvim-yarp ];
190159 });
191160
192− ncm2-jedi = generated.ncm2-jedi.overrideAttrs(old: {
193− dependencies = [ nvim-yarp ncm2 ];
161+ ncm2-jedi = super.ncm2-jedi.overrideAttrs(old: {
162+ dependencies = with super; [ nvim-yarp ncm2 ];
194163 passthru.python3Dependencies = ps: with ps; [ jedi ];
195164 });
196165
197− ncm2-ultisnips = generated.ncm2-ultisnips.overrideAttrs(old: {
198− dependencies = [ ultisnips ];
166+ ncm2-ultisnips = super.ncm2-ultisnips.overrideAttrs(old: {
167+ dependencies = with super; [ ultisnips ];
199168 });
200169
201− taglist-vim = generated.taglist-vim.overrideAttrs(old: {
170+ taglist-vim = super.taglist-vim.overrideAttrs(old: {
202171 setSourceRoot = ''
203172 export sourceRoot=taglist
204173 mkdir taglist
@@ -207,40 +176,40 @@ rec {
207176 '';
208177 });
209178
210− vimshell-vim = generated.vimshell-vim.overrideAttrs(old: {
211− dependencies = [ vimproc-vim ];
179+ vimshell-vim = super.vimshell-vim.overrideAttrs(old: {
180+ dependencies = with super; [ vimproc-vim ];
212181 });
213182
214− vim-addon-manager = generated.vim-addon-manager.overrideAttrs(old: {
183+ vim-addon-manager = super.vim-addon-manager.overrideAttrs(old: {
215184 buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa;
216185 });
217186
218− vim-addon-actions = generated.vim-addon-actions.overrideAttrs(old: {
219− dependencies = [ vim-addon-mw-utils tlib_vim ];
187+ vim-addon-actions = super.vim-addon-actions.overrideAttrs(old: {
188+ dependencies = with super; [ vim-addon-mw-utils tlib_vim ];
220189 });
221190
222− vim-addon-async = generated.vim-addon-async.overrideAttrs(old: {
223− dependencies = [ vim-addon-signs ];
191+ vim-addon-async = super.vim-addon-async.overrideAttrs(old: {
192+ dependencies = with super; [ vim-addon-signs ];
224193 });
225194
226− vim-addon-background-cmd = generated.vim-addon-background-cmd.overrideAttrs(old: {
227− dependencies = [ vim-addon-mw-utils ];
195+ vim-addon-background-cmd = super.vim-addon-background-cmd.overrideAttrs(old: {
196+ dependencies = with super; [ vim-addon-mw-utils ];
228197 });
229198
230− vim-addon-completion = generated.vim-addon-completion.overrideAttrs(old: {
231− dependencies = [ tlib_vim ];
199+ vim-addon-completion = super.vim-addon-completion.overrideAttrs(old: {
200+ dependencies = with super; [ tlib_vim ];
232201 });
233202
234− vim-addon-goto-thing-at-cursor = generated.vim-addon-goto-thing-at-cursor.overrideAttrs(old: {
235− dependencies = [ tlib_vim ];
203+ vim-addon-goto-thing-at-cursor = super.vim-addon-goto-thing-at-cursor.overrideAttrs(old: {
204+ dependencies = with super; [ tlib_vim ];
236205 });
237206
238− vim-addon-mru = generated.vim-addon-mru.overrideAttrs(old: {
239− dependencies = [ vim-addon-other vim-addon-mw-utils ];
207+ vim-addon-mru = super.vim-addon-mru.overrideAttrs(old: {
208+ dependencies = with super; [ vim-addon-other vim-addon-mw-utils ];
240209 });
241210
242− vim-addon-nix = generated.vim-addon-nix.overrideAttrs(old: {
243− dependencies = [
211+ vim-addon-nix = super.vim-addon-nix.overrideAttrs(old: {
212+ dependencies = with super; [
244213 vim-addon-completion
245214 vim-addon-goto-thing-at-cursor
246215 vim-addon-errorformats
@@ -249,38 +218,38 @@ rec {
249218 ];
250219 });
251220
252− vim-addon-sql = generated.vim-addon-sql.overrideAttrs(old: {
253− dependencies = [ vim-addon-completion vim-addon-background-cmd tlib_vim ];
221+ vim-addon-sql = super.vim-addon-sql.overrideAttrs(old: {
222+ dependencies = with super; [ vim-addon-completion vim-addon-background-cmd tlib_vim ];
254223 });
255224
256− vim-addon-syntax-checker = generated.vim-addon-syntax-checker.overrideAttrs(old: {
257− dependencies = [ vim-addon-mw-utils tlib_vim ];
225+ vim-addon-syntax-checker = super.vim-addon-syntax-checker.overrideAttrs(old: {
226+ dependencies = with super; [ vim-addon-mw-utils tlib_vim ];
258227 });
259228
260− vim-addon-toggle-buffer = generated.vim-addon-toggle-buffer.overrideAttrs(old: {
261− dependencies = [ vim-addon-mw-utils tlib_vim ];
229+ vim-addon-toggle-buffer = super.vim-addon-toggle-buffer.overrideAttrs(old: {
230+ dependencies = with super; [ vim-addon-mw-utils tlib_vim ];
262231 });
263232
264− vim-addon-xdebug = generated.vim-addon-xdebug.overrideAttrs(old: {
265− dependencies = [ webapi-vim vim-addon-mw-utils vim-addon-signs vim-addon-async ];
233+ vim-addon-xdebug = super.vim-addon-xdebug.overrideAttrs(old: {
234+ dependencies = with super; [ webapi-vim vim-addon-mw-utils vim-addon-signs vim-addon-async ];
266235 });
267236
268− vim-bazel = generated.vim-bazel.overrideAttrs(old: {
269− dependencies = [ vim-maktaba ];
237+ vim-bazel = super.vim-bazel.overrideAttrs(old: {
238+ dependencies = with super; [ vim-maktaba ];
270239 });
271240
272− vim-codefmt = generated.vim-codefmt.overrideAttrs(old: {
273− dependencies = [ vim-maktaba ];
241+ vim-codefmt = super.vim-codefmt.overrideAttrs(old: {
242+ dependencies = with super; [ vim-maktaba ];
274243 });
275244
276− vim-easytags = generated.vim-easytags.overrideAttrs(old: {
277− dependencies = [ vim-misc ];
245+ vim-easytags = super.vim-easytags.overrideAttrs(old: {
246+ dependencies = with super; [ vim-misc ];
278247 });
279248
280249 # change the go_bin_path to point to a path in the nix store. See the code in
281250 # fatih/vim-go here
282251 # https://github.com/fatih/vim-go/blob/155836d47052ea9c9bac81ba3e937f6f22c8e384/autoload/go/path.vim#L154-L159
283− vim-go = generated.vim-go.overrideAttrs(old: let
252+ vim-go = super.vim-go.overrideAttrs(old: let
284253 binPath = lib.makeBinPath [
285254 asmfmt
286255 delve
@@ -308,7 +277,7 @@ rec {
308277 '';
309278 });
310279
311− vim-grammarous = generated.vim-grammarous.overrideAttrs(old: {
280+ vim-grammarous = super.vim-grammarous.overrideAttrs(old: {
312281 # use `:GrammarousCheck` to initialize checking
313282 # In neovim, you also want to use set
314283 # let g:grammarous#show_first_error = 1
@@ -321,31 +290,31 @@ rec {
321290 ];
322291 });
323292
324− vim-hier = generated.vim-hier.overrideAttrs(old: {
293+ vim-hier = super.vim-hier.overrideAttrs(old: {
325294 buildInputs = [ vim ];
326295 });
327296
328− vim-isort = generated.vim-isort.overrideAttrs(old: {
297+ vim-isort = super.vim-isort.overrideAttrs(old: {
329298 postPatch = ''
330299 substituteInPlace ftplugin/python_vimisort.vim \
331− --replace 'import vim' 'import vim; import sys; sys.path.append("${pythonPackages.isort}/${python.sitePackages}")'
300+ --replace 'import vim' 'import vim; import sys; sys.path.append("${python.pkgs.isort}/${python.sitePackages}")'
332301 '';
333302 });
334303
335− vim-snipmate = generated.vim-snipmate.overrideAttrs(old: {
336− dependencies = [ vim-addon-mw-utils tlib_vim ];
304+ vim-snipmate = super.vim-snipmate.overrideAttrs(old: {
305+ dependencies = with super; [ vim-addon-mw-utils tlib_vim ];
337306 });
338307
339308
340− vim-wakatime = generated.vim-wakatime.overrideAttrs(old: {
309+ vim-wakatime = super.vim-wakatime.overrideAttrs(old: {
341310 buildInputs = [ python ];
342311 });
343312
344− vim-xdebug = generated.vim-xdebug.overrideAttrs(old: {
313+ vim-xdebug = super.vim-xdebug.overrideAttrs(old: {
345314 postInstall = false;
346315 });
347316
348− vim-xkbswitch = generated.vim-xkbswitch.overrideAttrs(old: {
317+ vim-xkbswitch = super.vim-xkbswitch.overrideAttrs(old: {
349318 patchPhase = ''
350319 substituteInPlace plugin/xkbswitch.vim \
351320 --replace /usr/local/lib/libxkbswitch.so ${xkb_switch}/lib/libxkbswitch.so
@@ -353,14 +322,14 @@ rec {
353322 buildInputs = [ xkb_switch ];
354323 });
355324
356− vim-yapf = generated.vim-yapf.overrideAttrs(old: {
325+ vim-yapf = super.vim-yapf.overrideAttrs(old: {
357326 buildPhase = ''
358327 substituteInPlace ftplugin/python_yapf.vim \
359− --replace '"yapf"' '"${python3Packages.yapf}/bin/yapf"'
328+ --replace '"yapf"' '"${python3.pkgs.yapf}/bin/yapf"'
360329 '';
361330 });
362331
363− vimproc-vim = generated.vimproc-vim.overrideAttrs(old: {
332+ vimproc-vim = super.vimproc-vim.overrideAttrs(old: {
364333 buildInputs = [ which ];
365334
366335 buildPhase = ''
@@ -372,11 +341,11 @@ rec {
372341 '';
373342 });
374343
375− YankRing-vim = generated.YankRing-vim.overrideAttrs(old: {
344+ YankRing-vim = super.YankRing-vim.overrideAttrs(old: {
376345 sourceRoot = ".";
377346 });
378347
379− youcompleteme = generated.youcompleteme.overrideAttrs(old: {
348+ youcompleteme = super.youcompleteme.overrideAttrs(old: {
380349 buildPhase = ''
381350 substituteInPlace plugin/youcompleteme.vim \
382351 --replace "'ycm_path_to_python_interpreter', '''" \
@@ -395,9 +364,9 @@ rec {
395364 };
396365 });
397366
398− jedi-vim = generated.jedi-vim.overrideAttrs(old: {
367+ jedi-vim = super.jedi-vim.overrideAttrs(old: {
399368 # checking for python3 support in vim would be neat, too, but nobody else seems to care
400− buildInputs = [ python3Packages.jedi ];
369+ buildInputs = [ python3.pkgs.jedi ];
401370 meta = {
402371 description = "code-completion for python using python-jedi";
403372 license = stdenv.lib.licenses.mit;