| Commit message (Collapse) | Author | Age |
|---|
| |\
| |
| |
| |
| | |
hercules-ci/issue-146882-transparent-submodule-options
lib.modules: Let module declare options directly in bare submodule
|
| | | |
|
| | | |
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
... where a bare submodule is an option that has a type like
`submoduleWith x`, as opposed to `attrsOf (submoduleWith x)`.
This makes migration unnecessary when introducing a freeform type
in an existing option tree.
Closes #146882
|
| |/ |
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
This ensures that the module file locations are propagated to the
freeform type, which makes it so that submodules in freeform types now
have their declaration location shown in the manual, fixing
https://github.com/NixOS/nixpkgs/issues/132085.
In addition, this also newly allows freeformTypes to be declared
multiple times and all declarations being merged together according to
normal option merging.
This also removes some awkwardness regarding the type of `freeformType`
|
| |
|
|
|
|
| |
This type correctly merges multiple option types together while also
annotating them with file information. In a future commit this will be
used for `_module.freeformType`
|
| | |
|
| | |
|
| |\
| |
| | |
lib/modules: Short-circuit unmatchedDefns when configs is empty
|
| | |
| |
| |
| |
| | |
Doesn't seem to have been a problem actually, but now it won't
regress.
|
| | | |
|
| |/
|
|
|
|
|
| |
Allows the simultaneous construction of top-level invocations and
submodule types.
This helps structure configuration systems integration code.
|
| |
|
|
|
| |
Previously it would give an error if there were multiple function
definitions.
|
| |
|
|
| |
This reverts commit 8b957e3b301d748e6fbbed806d82bd9d4b9d4ac4.
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In 2d45a62899d47c109a0b8ce4ca9d33265b8a1a37, the submodule type
description was amended with the freeformType description. This causes
all the modules passed to the submodule to be evaluated once on their
own, without any extra definitions from the config section. This means
that the specified modules need to be valid on their own, without any
undeclared options.
This commit adds a test that evaluates a submodules option description,
which would trigger the above problem for one of the tests, if it were
not fixed by this commit as well.
This is done because the next commit makes option evaluation a bit more
strict, which would also trigger this test failure, even though it's not
related to the change at all.
|
| | |
|
| |
|
|
| |
(cherry picked from commit 478af112e83df806bd8a51174834d2a130fbdeb9)
|
| |
|
|
| |
assertions"
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Previously the .enable option was used to encode the condition as well,
which lead to some oddness:
- In order to encode an assertion, one had to invert it
- To disable a check, one had to mkForce it
By introducing a separate .check option this is solved because:
- It can be used to encode assertions
- Disabling is done separately with .enable option, whose default can be
overridden without a mkForce
|
| |
|
|
|
|
| |
Previously this option was thought to be necessary to avoid infinite
recursion, but it actually isn't, since the check evaluation isn't fed
back into the module fixed-point.
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
| |
This introduces `freeformType` as a top-level module attribute, allowing
definitions like
{
freeformType = ...;
options = ...;
config = ...;
}
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
| |
set"
This reverts commit 15c873b486347e7861c64fb0b5a7852be9fc82e4.
This was causing infinite recursion when depending on nested options
|
| |\
| |
| | |
Minor module improvements
|
| | | |
|
| |/ |
|
| | |
|
| |
|
|
|
|
|
|
|
| |
Fix the broken test in https://github.com/NixOS/nixpkgs/pull/77416
Apparently hydra uses `nix-build lib/tests/release.nix` to run all
tests, where IFD isn't allowed. Fortunately we can get around this with
builtins.toFile, which doesn't require IFD, but still can test the
properties we want.
|
| | |
|
| |\
| |
| | |
Apply `disabledModules` recursively
|
| | | |
|
| |/ |
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This commit changes the `mkAliasOptionModule` function to make sure that
the priority for the aliased option is propagated to the non-aliased
option.
This also affects the `mkRenamedOptionModule` function in a similar
fashion.
This also removes the `mkAliasOptionModuleWithPriority` function, since
its functionality is now subsumed by `mkAliasOptionModule`.
This change was recommended by @nbp:
https://github.com/NixOS/nixpkgs/pull/53397#discussion_r245487432
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This commit adds a function `mkAliasOptionModuleWithPriority`. This
function will make an alias to an existing option and copy over the
priority.
This functionality is needed for PRs like #53041. In that case
`nixos-generate-config` added an option to `hardware-configuration.nix`
with `mkDefault`. That option was then changed and an alias created for
the old name.
The end user should be able to set the non-alias option in their
`configuration.nix` and have everything work correctly. Without this
function, the priority for the option won't be copied over correctly
and the end-user will get a message saying they have the same option
set to two different values.
|
| | |
|
| |
|
|
|
|
|
| |
Assigning a list of 10 or more elements to an option having the type
`loaOf a` produces a configuration value that is not honoring the
order of the original list. This commit fixes this and a related issue
arising when 10 or more lists are merged into this type of option.
|
| | |
|
| |
|
|
| |
For values that are positive, but cannot be 0.
|