Merge branch 'main' into hm-merge-lists

This commit is contained in:
raf 2024-07-10 21:07:20 +00:00 committed by GitHub
commit f3d3741daa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 173 additions and 97 deletions

View file

@ -9,7 +9,7 @@
typesCustom = import ./custom.nix {inherit lib;};
in {
inherit (typesDag) dagOf;
inherit (typesPlugin) pluginsOpt extraPluginType mkPluginSetupOption luaInline;
inherit (typesPlugin) pluginsOpt extraPluginType mkPluginSetupOption luaInline pluginType;
inherit (typesLanguage) diagnostics mkGrammarOption;
inherit (typesCustom) anythingConcatLists;
}

View file

@ -52,7 +52,7 @@
};
};
in {
inherit extraPluginType fromInputs;
inherit extraPluginType fromInputs pluginType;
pluginsOpt = {
description,