movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-09 19:13:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

lib/types: types.either deprecate functor.wrapped in favor of functor.payload.elemType

Browse source
This commit is contained in:
Johannes Kirschbauer 2025-01-19 16:39:44 +01:00
parent 987a096334
commit 484a0477d8
No known key found for this signature in database
4 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/types.nix
View file

@ -1134,13 +1134,13 @@ rec {
then t2.merge loc defs
else mergeOneOption loc defs;
typeMerge = f':
let mt1 = t1.typeMerge (elemAt f'.wrapped 0).functor;
mt2 = t2.typeMerge (elemAt f'.wrapped 1).functor;
let mt1 = t1.typeMerge (elemAt f'.payload.elemType 0).functor;
mt2 = t2.typeMerge (elemAt f'.payload.elemType 1).functor;
in
if (name == f'.name) && (mt1 != null) && (mt2 != null)
then functor.type mt1 mt2
else null;
functor = (defaultFunctor name) // { wrapped = [ t1 t2 ]; };
functor = elemTypeFunctor name { elemType = [ t1 t2 ]; };
nestedTypes.left = t1;
nestedTypes.right = t2;
};