NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-09-06 10:21:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #939 from Gerg-L/main
Some checks failed
Set up binary cache / cachix (default) (push) Has been cancelled
Details
Set up binary cache / cachix (maximal) (push) Has been cancelled
Details
Set up binary cache / cachix (nix) (push) Has been cancelled
Details
Treewide Checks / Validate flake (push) Has been cancelled
Details
Treewide Checks / Check formatting (push) Has been cancelled
Details
Treewide Checks / Check source tree for typos (push) Has been cancelled
Details
Treewide Checks / Validate documentation builds (push) Has been cancelled
Details
Treewide Checks / Validate hyperlinks in documentation sources (push) Has been cancelled
Details
Treewide Checks / Validate Editorconfig conformance (push) Has been cancelled
Details
Build and deploy documentation / Check latest commit (push) Has been cancelled
Details
Build and deploy documentation / publish (push) Has been cancelled
Details

Browse source 
fix: pluginOverrides attempting to build
This commit is contained in:
Ching Pei Yang 2025-06-11 10:50:19 +02:00 • committed by GitHub
commit 2a2b5e2790
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/wrapper/build/config.nix
View file

@ -7,9 +7,9 @@
}: let }: let
inherit (pkgs) vimPlugins; inherit (pkgs) vimPlugins;
inherit (lib.trivial) flip; inherit (lib.trivial) flip;
inherit (builtins) filter isString; inherit (builtins) filter isString hasAttr getAttr;
getPin = name: ((pkgs.callPackages ../../../npins/sources.nix {}) // config.vim.pluginOverrides).${name}; getPin = flip getAttr (pkgs.callPackages ../../../npins/sources.nix {});
noBuildPlug = pname: let noBuildPlug = pname: let
pin = getPin pname; pin = getPin pname;
@ -54,7 +54,16 @@
buildConfigPlugins = plugins: buildConfigPlugins = plugins:
map (plug: map (plug:
if (isString plug) if (isString plug)
then pluginBuilders.${plug} or (noBuildPlug plug) then
if hasAttr plug config.vim.pluginOverrides
then
(let
plugin = config.vim.pluginOverrides.${plug};
in
if (lib.isType "flake" plugin)
then plugin // {name = plug;}
else plugin)
else pluginBuilders.${plug} or (noBuildPlug plug)
else plug) ( else plug) (
filter (f: f != null) plugins filter (f: f != null) plugins
); );