From 116ff37156c8b401dbca15f37d23af9f7e8e577e Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Thu, 14 Aug 2025 17:28:22 +0200 Subject: [PATCH] exports: rename special args --- .../inventory/distributed-service/all-services-wrapper.nix | 2 +- .../inventory/distributed-service/service-module.nix | 4 ++-- lib/modules/inventory/distributed-service/tests/exports.nix | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/modules/inventory/distributed-service/all-services-wrapper.nix b/lib/modules/inventory/distributed-service/all-services-wrapper.nix index 3fd9acdf2..eda9940ab 100644 --- a/lib/modules/inventory/distributed-service/all-services-wrapper.nix +++ b/lib/modules/inventory/distributed-service/all-services-wrapper.nix @@ -32,7 +32,7 @@ in { name, ... }: { _module.args._ctx = [ name ]; - _module.args.exports' = config.exports; + _module.args.exports = config.exports; _module.args.directory = directory; } diff --git a/lib/modules/inventory/distributed-service/service-module.nix b/lib/modules/inventory/distributed-service/service-module.nix index 537c552ef..63a687fd2 100644 --- a/lib/modules/inventory/distributed-service/service-module.nix +++ b/lib/modules/inventory/distributed-service/service-module.nix @@ -635,10 +635,10 @@ in This services exports. Gets merged with all other services exports - Final value (merged and evaluated with other services) available as `exports'` in the arguments of this module. + Final value (merged and evaluated with other services) available as `exports` in the arguments of this module. ```nix - { exports', ... }: { + { exports, ... }: { _class = "clan.service"; # ... } diff --git a/lib/modules/inventory/distributed-service/tests/exports.nix b/lib/modules/inventory/distributed-service/tests/exports.nix index bc9c6cb54..f42c104cf 100644 --- a/lib/modules/inventory/distributed-service/tests/exports.nix +++ b/lib/modules/inventory/distributed-service/tests/exports.nix @@ -24,7 +24,7 @@ let machines.sara = { }; # A module that adds exports perMachine modules.A = - { exports', ... }: + { exports, ... }: { manifest.name = "A"; roles.peer.perInstance = @@ -32,10 +32,10 @@ let { # Cross reference a perMachine exports exports.vars.generators."${machine.name}-network-ip".script = - "A:" + exports'.machines.${machine.name}.vars.generators.key.script; + "A:" + exports.machines.${machine.name}.vars.generators.key.script; # Cross reference a perInstance exports from a different service exports.vars.generators."${machine.name}-full-hostname".script = - "A:" + exports'.instances."B-1".vars.generators.hostname.script; + "A:" + exports.instances."B-1".vars.generators.hostname.script; }; roles.server = { }; perMachine =