this derivation will be built: /nix/store/q9fsn2k60kkazzxs379fha44zdyyypbb-treefmt-check.drv building '/nix/store/q9fsn2k60kkazzxs379fha44zdyyypbb-treefmt-check.drv' treefmt-check> treefmt v2.5.0traversed 723 files treefmt-check> emitted 499 files for processing treefmt-check> formatted 499 files (2 changed) in 3.003s treefmt-check> M hosts/mali/opencloud-home.nix treefmt-check> M tests/opencloud-eval.nix treefmt-check> diff --git a/hosts/mali/opencloud-home.nix b/hosts/mali/opencloud-home.nix treefmt-check> index 0fdcbc7..72fd044 100644 treefmt-check> --- a/hosts/mali/opencloud-home.nix treefmt-check> +++ b/hosts/mali/opencloud-home.nix treefmt-check> @@ -11,20 +11,18 @@ in treefmt-check> { treefmt-check> options.modules.services.opencloud.maliStorage = lib.mkOption { treefmt-check> type = lib.types.nullOr ( treefmt-check> - lib.types.submodule ( treefmt-check> - _: { treefmt-check> - options = { treefmt-check> - dataset = lib.mkOption { treefmt-check> - type = lib.types.str; treefmt-check> - description = "ZFS dataset containing this OpenCloud instance's data."; treefmt-check> - }; treefmt-check> - dataDir = lib.mkOption { treefmt-check> - type = lib.types.str; treefmt-check> - description = "Mountpoint for this OpenCloud instance's data dataset."; treefmt-check> - }; treefmt-check> + lib.types.submodule (_: { treefmt-check> + options = { treefmt-check> + dataset = lib.mkOption { treefmt-check> + type = lib.types.str; treefmt-check> + description = "ZFS dataset containing this OpenCloud instance's data."; treefmt-check> }; treefmt-check> - } treefmt-check> - ) treefmt-check> + dataDir = lib.mkOption { treefmt-check> + type = lib.types.str; treefmt-check> + description = "Mountpoint for this OpenCloud instance's data dataset."; treefmt-check> + }; treefmt-check> + }; treefmt-check> + }) treefmt-check> ); treefmt-check> default = null; treefmt-check> description = "Mali storage and NFS export for one OpenCloud instance."; treefmt-check> diff --git a/tests/opencloud-eval.nix b/tests/opencloud-eval.nix treefmt-check> index c99b9f3..93a3df6 100644 treefmt-check> --- a/tests/opencloud-eval.nix treefmt-check> +++ b/tests/opencloud-eval.nix treefmt-check> @@ -58,9 +58,7 @@ assert c.users.users.opencloud-beta.uid == 3102; treefmt-check> assert c.users.users.opencloud-alpha.linger; treefmt-check> assert c.virtualisation.quadlet.containers.opencloud-alpha.uid == 3101; treefmt-check> assert c.virtualisation.quadlet.containers.opencloud-beta.uid == 3102; treefmt-check> -assert builtins.elem "PROXY_OIDC_REWRITE_WELLKNOWN=true" ( treefmt-check> - c.virtualisation.quadlet.containers.opencloud-alpha.containerConfig.Environment treefmt-check> -); treefmt-check> +assert builtins.elem "PROXY_OIDC_REWRITE_WELLKNOWN=true" c.virtualisation.quadlet.containers.opencloud-alpha.containerConfig.Environment; treefmt-check> assert builtins.elem "opencloud-alpha-office.service" ( treefmt-check> c.virtualisation.quadlet.containers.opencloud-alpha.unitConfig.Requires or [ ] treefmt-check> ); error: Cannot build '/nix/store/q9fsn2k60kkazzxs379fha44zdyyypbb-treefmt-check.drv'. Reason: builder failed with exit code 1. Output paths: /nix/store/9njkzxw5mpwmyf8ql5zklagkbyic5ssq-treefmt-check Last 25 log lines: > - ) > + dataDir = lib.mkOption { > + type = lib.types.str; > + description = "Mountpoint for this OpenCloud instance's data dataset."; > + }; > + }; > + }) > ); > default = null; > description = "Mali storage and NFS export for one OpenCloud instance."; > diff --git a/tests/opencloud-eval.nix b/tests/opencloud-eval.nix > index c99b9f3..93a3df6 100644 > --- a/tests/opencloud-eval.nix > +++ b/tests/opencloud-eval.nix > @@ -58,9 +58,7 @@ assert c.users.users.opencloud-beta.uid == 3102; > assert c.users.users.opencloud-alpha.linger; > assert c.virtualisation.quadlet.containers.opencloud-alpha.uid == 3101; > assert c.virtualisation.quadlet.containers.opencloud-beta.uid == 3102; > -assert builtins.elem "PROXY_OIDC_REWRITE_WELLKNOWN=true" ( > - c.virtualisation.quadlet.containers.opencloud-alpha.containerConfig.Environment > -); > +assert builtins.elem "PROXY_OIDC_REWRITE_WELLKNOWN=true" c.virtualisation.quadlet.containers.opencloud-alpha.containerConfig.Environment; > assert builtins.elem "opencloud-alpha-office.service" ( > c.virtualisation.quadlet.containers.opencloud-alpha.unitConfig.Requires or [ ] > ); For full logs, run: nix log /nix/store/q9fsn2k60kkazzxs379fha44zdyyypbb-treefmt-check.drv