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

lib: migrate to nixpkgs v2 merge mechanism

Browse source 
Signed-off-by: NotAShelf <raf@notashelf.dev>
Change-Id: If5bf0e5f302afb9f7018b55a96109c006a6a6964
This commit is contained in:
raf 2025-11-01 20:23:09 +03:00
commit 04c8715279
Signed by: NotAShelf
GPG key ID: 29D95B64378DB4BF
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/types/custom.nix
View file

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

8
lib/types/dag.nix
View file

@ -62,7 +62,13 @@ in rec {
inherit (elemType) getSubModules; inherit (elemType) getSubModules;
getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<name>"]); getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<name>"]);
substSubModules = m: dagOf (elemType.substSubModules m); 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; nestedTypes.elemType = elemType;
}; };
} }