lib/types: defaultTypeMerge merge payload before wrapped

NixOS · Nov 7, 2024 · 7de011e · 7de011e
1 parent d2dfc1a
commit 7de011e
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/lib/types.nix b/lib/types.nix
@@ -93,12 +93,13 @@ rec {
     else if    (f.wrapped == null && f'.wrapped == null)
             && (f.payload == null && f'.payload == null)
        then f.type
-    # composed types
-    else if (f.wrapped != null && f'.wrapped != null) && (wrapped != null)
-       then f.type wrapped
     # value types
-    else if (f.payload != null && f'.payload != null) && (payload != null)
+    else if (f.payload != null && f'.payload != null)
        then f.type payload
+    # composed types
+    # TODO(@hsjobeki) should be moved into payload once we have a default binOp for composed types
+    else if (f.wrapped != null && f'.wrapped != null)
+       then f.type wrapped
     else null;
 
   # Default type functor