From 81a0a8be297a88f338ee0fd90c330cd94b4a55bd Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 13 May 2022 09:09:16 +0200
Subject: lib/tests/modules: Test functionTo submodule merging too

---
 lib/tests/modules/functionTo/submodule-options.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'lib/tests/modules')

diff --git a/lib/tests/modules/functionTo/submodule-options.nix b/lib/tests/modules/functionTo/submodule-options.nix
index 7bf708231504..b884892efd6a 100644
--- a/lib/tests/modules/functionTo/submodule-options.nix
+++ b/lib/tests/modules/functionTo/submodule-options.nix
@@ -10,7 +10,7 @@ in
       options = {
         fun = lib.mkOption {
           type = types.functionTo (types.submodule {
-            options.a = lib.mkOption { };
+            options.a = lib.mkOption { default = "a"; };
           });
         };
       };
@@ -21,7 +21,7 @@ in
       options = {
         fun = lib.mkOption {
           type = types.functionTo (types.submodule {
-            options.b = lib.mkOption { };
+            options.b = lib.mkOption { default = "b"; };
           });
         };
       };
@@ -30,6 +30,12 @@ in
 
   options = {
     result = lib.mkOption
+      {
+        type = types.str;
+        default = lib.concatStringsSep " " (lib.attrValues (config.fun (throw "shouldn't use input param")));
+      };
+
+    optionsResult = lib.mkOption
       {
         type = types.str;
         default = lib.concatStringsSep " "
@@ -50,10 +56,6 @@ in
 
   config.fun = lib.mkMerge
     [
-      (input: { inherit (input) a; })
-      (input: { inherit (input) b; })
-      (input: {
-        b = lib.mkForce input.c;
-      })
+      (input: { b = "bee"; })
     ];
 }
-- 
cgit 1.4.1