From 0d37194faba1155e4c1ef5775a88de39e5ef6672 Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Wed, 6 Aug 2025 14:25:27 -0600 Subject: [PATCH] doctrine/lib: add optional prefix/namespace args to mkModule --- doctrine/lib/mk-module.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/doctrine/lib/mk-module.nix b/doctrine/lib/mk-module.nix index 78449fe..e72ca08 100644 --- a/doctrine/lib/mk-module.nix +++ b/doctrine/lib/mk-module.nix @@ -9,12 +9,14 @@ sys ? null, options ? null, requires ? [], + prefix ? doctrine.prefix, + namespace ? doctrine.namespace, }: let optionsSet = import options { inherit config lib pkgs cfg name doctrine; }; - configSet = import configFiles.${doctrine.namespace} { + configSet = import configFiles.${namespace} { inherit config lib pkgs doctrine cfg; }; @@ -22,17 +24,17 @@ inherit sys hm; }; - cfg = config.${doctrine.prefix}.${name}; + cfg = config.${prefix}.${name}; in { config = - lib.optionalAttrs (configFiles ? ${doctrine.namespace}) + lib.optionalAttrs (configFiles ? ${namespace}) (lib.mkIf cfg.enable (lib.mkMerge [ configSet { assertions = map (dependency: { - assertion = cfg.enable -> config.${doctrine.prefix}.${dependency}.enable; - message = "${doctrine.prefix}.${name}.enable requires ${doctrine.prefix}.${dependency}.enable"; + assertion = cfg.enable -> config.${prefix}.${dependency}.enable; + message = "${prefix}.${name}.enable requires ${prefix}.${dependency}.enable"; }) requires; } @@ -40,9 +42,9 @@ in { options = lib.optionalAttrs (options != null - && optionsSet ? ${doctrine.namespace}) { - ${doctrine.prefix}.${name} = - optionsSet.${doctrine.namespace} + && optionsSet ? ${namespace}) { + ${prefix}.${name} = + optionsSet.${namespace} // { enable = lib.mkEnableOption name; };