forked from mirrors/nixpkgs
lib/types, lib/modules: Remove unused extensionOffset
This commit is contained in:
parent
d4a84aeeca
commit
9dead5565a
|
@ -113,10 +113,6 @@ rec {
|
||||||
args ? {}
|
args ? {}
|
||||||
, # This would be remove in the future, Prefer _module.check option instead.
|
, # This would be remove in the future, Prefer _module.check option instead.
|
||||||
check ? true
|
check ? true
|
||||||
# Internal variable to avoid `_key` collisions regardless
|
|
||||||
# of `extendModules`. Used in `submoduleWith`.
|
|
||||||
# Test case: lib/tests/modules, "168767"
|
|
||||||
, extensionOffset ? 0
|
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
withWarnings = x:
|
withWarnings = x:
|
||||||
|
@ -345,17 +341,15 @@ rec {
|
||||||
modules ? [],
|
modules ? [],
|
||||||
specialArgs ? {},
|
specialArgs ? {},
|
||||||
prefix ? [],
|
prefix ? [],
|
||||||
extensionOffset ? length modules,
|
|
||||||
}:
|
}:
|
||||||
evalModules (evalModulesArgs // {
|
evalModules (evalModulesArgs // {
|
||||||
modules = regularModules ++ modules;
|
modules = regularModules ++ modules;
|
||||||
specialArgs = evalModulesArgs.specialArgs or {} // specialArgs;
|
specialArgs = evalModulesArgs.specialArgs or {} // specialArgs;
|
||||||
prefix = extendArgs.prefix or evalModulesArgs.prefix or [];
|
prefix = extendArgs.prefix or evalModulesArgs.prefix or [];
|
||||||
inherit extensionOffset;
|
|
||||||
});
|
});
|
||||||
|
|
||||||
type = lib.types.submoduleWith {
|
type = lib.types.submoduleWith {
|
||||||
inherit modules specialArgs extensionOffset;
|
inherit modules specialArgs;
|
||||||
};
|
};
|
||||||
|
|
||||||
result = withWarnings {
|
result = withWarnings {
|
||||||
|
|
|
@ -571,11 +571,6 @@ rec {
|
||||||
, specialArgs ? {}
|
, specialArgs ? {}
|
||||||
, shorthandOnlyDefinesConfig ? false
|
, shorthandOnlyDefinesConfig ? false
|
||||||
, description ? null
|
, description ? null
|
||||||
|
|
||||||
# Internal variable to avoid `_key` collisions regardless
|
|
||||||
# of `extendModules`. Wired through by `evalModules`.
|
|
||||||
# Test case: lib/tests/modules, "168767"
|
|
||||||
, extensionOffset ? 0
|
|
||||||
}@attrs:
|
}@attrs:
|
||||||
let
|
let
|
||||||
inherit (lib.modules) evalModules;
|
inherit (lib.modules) evalModules;
|
||||||
|
@ -623,7 +618,6 @@ rec {
|
||||||
(base.extendModules {
|
(base.extendModules {
|
||||||
modules = [ { _module.args.name = last loc; } ] ++ allModules defs;
|
modules = [ { _module.args.name = last loc; } ] ++ allModules defs;
|
||||||
prefix = loc;
|
prefix = loc;
|
||||||
extensionOffset = extensionOffset + length defs;
|
|
||||||
}).config;
|
}).config;
|
||||||
emptyValue = { value = {}; };
|
emptyValue = { value = {}; };
|
||||||
getSubOptions = prefix: (base.extendModules
|
getSubOptions = prefix: (base.extendModules
|
||||||
|
|
Loading…
Reference in a new issue