gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib.types.defaultTypeMerge: refactor functor.{payload,wrapped} merging

Browse Source
This commit is contained in:
Johannes Kirschbauer
2024-10-24 11:38:30 +02:00
parent d2dfc1ac21
commit b978799f71
3 changed files with 60 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tests/modules.sh
View File

@@ -516,6 +516,10 @@ checkConfigError 'The option .theOption.nested. in .other.nix. is already declar
# Test that types.optionType leaves types untouched as long as they don't need to be merged
checkConfigOutput 'ok' config.freeformItems.foo.bar ./adhoc-freeformType-survives-type-merge.nix
# Test that specifying both functor.wrapped and functor.payload isn't allowed
checkConfigError 'Type foo defines both `functor.payload` and `functor.wrapped` at the same time, which is not supported.' config.result ./default-type-merge-both.nix
# Anonymous submodules don't get nixed by import resolution/deduplication
# because of an `extendModules` bug, issue 168767.
checkConfigOutput '^1$' config.sub.specialisation.value ./extendModules-168767-imports.nix