From 43183d70c2a3380b50bfc4eeb126e3df0f93a751 Mon Sep 17 00:00:00 2001 From: Kiara Grouwstra Date: Sun, 24 Aug 2025 18:25:00 +0200 Subject: [PATCH] specialArgs: sources --- deployment/check/data-model/nixosTest.nix | 29 ++++++++++++++++------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/deployment/check/data-model/nixosTest.nix b/deployment/check/data-model/nixosTest.nix index 45c7201f..0e5b3a6a 100644 --- a/deployment/check/data-model/nixosTest.nix +++ b/deployment/check/data-model/nixosTest.nix @@ -66,20 +66,20 @@ in ' let - system = builtins.currentSystem; + args = builtins.fromJSON "${ + lib.replaceStrings [ "\"" ] [ "\\\\\"" ] ( + lib.strings.toJSON { + inherit sources; + } + ) + }"; + inherit (args) sources; configuration = { pkgs, config, ... }: { imports = [ ${pathToRoot}/deployment/check/common/sharedOptions.nix ${pathToRoot}/deployment/check/common/targetNode.nix ]; - _module.args = builtins.fromJSON "${ - lib.replaceStrings [ "\"" ] [ "\\\\\"" ] ( - lib.strings.toJSON { - inherit sources; - } - ) - }"; enableAcme = ${lib.strings.toJSON config.enableAcme}; acmeNodeIP = if config.enableAcme then config.nodes.acme.networking.primaryIPAddress else null; @@ -89,7 +89,18 @@ in autoconf ]; }; - os = import "${sources.nixpkgs}/nixos" { inherit system configuration; }; + eval = import "${sources.nixpkgs}/nixos/lib/eval-config.nix" { + system = builtins.currentSystem; + specialArgs = { + inherit sources; + }; + modules = [ configuration ]; + }; + os = { + inherit (eval) pkgs config options; + system = eval.config.system.build.toplevel; + inherit (eval.config.system.build) vm vmWithBootLoader; + }; in # import "${pathToRoot}/deployment/nixos.nix" {} {