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

either type: improve merge function

Browse source
This commit is contained in:
Eric Sagnes 2016-11-07 08:34:06 +09:00 • committed by Bjørn Forsman
parent 0ba3d429a7
commit cf2654b2e0
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/types.nix
View file

@ -333,7 +333,15 @@ rec {
name = "either"; name = "either";
description = "${t1.description} or ${t2.description}"; description = "${t1.description} or ${t2.description}";
check = x: t1.check x || t2.check x; check = x: t1.check x || t2.check x;
merge = mergeOneOption; merge = loc: defs:
let
defList = map (d: d.value) defs;
in
if all (x: t1.check x) defList
then t1.merge loc defs
else if all (x: t2.check x) defList
then t2.merge loc defs
else mergeOneOption loc defs;
typeMerge = f': typeMerge = f':
let mt1 = t1.typeMerge (elemAt f'.wrapped 0).functor; let mt1 = t1.typeMerge (elemAt f'.wrapped 0).functor;
mt2 = t2.typeMerge (elemAt f'.wrapped 1).functor; mt2 = t2.typeMerge (elemAt f'.wrapped 1).functor;