fix deployment evaluation

deployment/data-model-test.nix

@@ -14,6 +14,7 @@ let
       ];
     }).config;
   nixops4Deployment = inputs.nixops4.modules.nixops4Deployment.default;
+  inherit (inputs.nixops4.lib) mkDeployment;
 in
 {
   test-eval = {
@@ -163,27 +164,36 @@ in
             };
           }
         );
+        resources = fediversity.applications.hello.resources fediversity.example-configuration.applications.hello;
+        hello-shell = (resources).resources.hello.login-shell;
+        environment = fediversity.environments.single-nixos-vm.resources.operator-environment.login-shell;
+        result = mkDeployment {
+          modules = [
+            (fediversity.environments.single-nixos-vm.deployment fediversity.example-configuration)
+          ];
+        };
+
       in
       rec {
         number-of-resources = with lib; length (attrNames fediversity.resources);
         inherit (fediversity) example-configuration;
-        hello-package-exists =
+        hello-package-exists = hello-shell.packages ? hello;
-          (fediversity.applications.hello.resources example-configuration.applications.hello)
+        wheel-required = hello-shell.wheel;
-          .resources.hello.login-shell.packages ? hello;
+        wheel-allowed = environment.wheel;
-        wheel-required =
-          (fediversity.applications.hello.resources example-configuration.applications.hello)
-          .resources.hello.login-shell.wheel;
-        wheel-allowed =
-          fediversity.environments.single-nixos-vm.resources.operator-environment.login-shell.wheel;
         operator-shell =
           let
-            resources = fediversity.applications.hello.resources example-configuration.applications.hello;
+            operator = (environment.apply resources).operator;
-            users = fediversity.environments.single-nixos-vm.resources.operator-environment.login-shell.apply resources;
           in
           {
-            inherit (users.operator) isNormalUser;
+            inherit (operator) isNormalUser;
-            packages = with lib; map (p: "${p.pname}") users.operator.packages;
+            packages = with lib; map (p: "${p.pname}") operator.packages;
-            extraGroups = users.operator.extraGroups;
+            extraGroups = operator.extraGroups;
+          };
+        deployment = {
+          inherit (result) _type;
+          deploymentFunction = lib.isFunction result.deploymentFunction;
+          # XXX(@fricklerhandwerk): evaluating the derivation takes a bit, we may want to stop at `isFunction` here
+          getProviders = lib.isDerivation (result.getProviders { system = builtins.currentSystem; });
         };
       };
     expected = {
@@ -200,6 +210,11 @@ in
         packages = [ "hello" ];
         extraGroups = [ ];
       };
+      deployment = {
+        _type = "nixops4Deployment";
+        deploymentFunction = true;
+        getProviders = true;
+      };
     };
   };
 }

deployment/data-model.nix

@@ -10,7 +10,6 @@ let
     attrsOf
     attrTag
     deferredModuleWith
-    submoduleWith
     submodule
     optionType
     functionTo
@@ -154,12 +153,12 @@ in
               readOnly = true;
               default = {
                 input-type = application-resources;
-                output-type = types.raw;
+                output-type = nixops4Deployment;
               };
             };
             deployment = mkOption {
               description = "Generate a deployment from a configuration";
-              type = functionTo (submodule environment.config.resource-mapping.output-type);
+              type = functionTo (environment.config.resource-mapping.output-type);
               readOnly = true;
               default =
                 cfg: