diff --git a/flake.lock b/flake.lock index 5a357a75..e7788c60 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1760948891, - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", + "lastModified": 1759362264, + "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", + "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", "type": "github" }, "original": { @@ -53,11 +53,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761880412, - "narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=", + "lastModified": 1759386674, + "narHash": "sha256-wg1Lz/1FC5Q13R+mM5a2oTV9TA9L/CHHTm3/PiLayfA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a7fc11be66bdfb5cdde611ee5ce381c183da8386", + "rev": "625ad6366178f03acd79f9e3822606dd7985b657", "type": "github" }, "original": { diff --git a/lib/types/custom.nix b/lib/types/custom.nix index 8e8be8a2..c42cd2ce 100644 --- a/lib/types/custom.nix +++ b/lib/types/custom.nix @@ -3,11 +3,13 @@ inherit (lib.strings) isString stringLength match; inherit (lib.types) listOf mkOptionType; in { - mergelessListOf = elemType: - mkOptionType { + mergelessListOf = elemType: let + super = listOf elemType; + in + super + // { name = "mergelessListOf"; - description = "mergeless list of ${elemType.description or "values"}"; - inherit (lib.types.listOf elemType) check; + description = "mergeless ${super.description}"; merge = mergeEqualOption; }; diff --git a/lib/types/dag.nix b/lib/types/dag.nix index 6d289e27..a42ed513 100644 --- a/lib/types/dag.nix +++ b/lib/types/dag.nix @@ -62,13 +62,7 @@ in rec { inherit (elemType) getSubModules; getSubOptions = prefix: elemType.getSubOptions (prefix ++ [""]); substSubModules = m: dagOf (elemType.substSubModules m); - functor = { - name = name; - type = dagOf; - wrapped = elemType; - payload = elemType; - binOp = a: b: a; - }; + functor = (defaultFunctor name) // {wrapped = elemType;}; nestedTypes.elemType = elemType; }; }