NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-11-16 18:44:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'upstream' into v0.8

Browse source
This commit is contained in:
Ching Pei Yang 2025-11-14 18:11:25 +01:00
commit 7e0ec5bce7
No known key found for this signature in database
GPG key ID: B3841364253DC4C8
8 changed files with 39 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/types/custom.nix
View file

@ -4,13 +4,11 @@
inherit (lib.strings) isString stringLength match;
inherit (lib.types) listOf mkOptionType coercedTo;
in {
mergelessListOf = elemType: let
super = listOf elemType;
in
super
// {
mergelessListOf = elemType:
mkOptionType {
name = "mergelessListOf";
description = "mergeless ${super.description}";
description = "mergeless list of ${elemType.description or "values"}";
inherit (lib.types.listOf elemType) check;
merge = mergeEqualOption;
};

8
lib/types/dag.nix
View file

@ -62,7 +62,13 @@ in rec {
inherit (elemType) getSubModules;
getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<name>"]);
substSubModules = m: dagOf (elemType.substSubModules m);
functor = (defaultFunctor name) // {wrapped = elemType;};
functor = {
name = name;
type = dagOf;
wrapped = elemType;
payload = elemType;
binOp = a: b: a;
};
nestedTypes.elemType = elemType;
};
}