nixos-rebuild-ng: fix non-flake remote build evaluation (#381511)

Author: thiagokokada

pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py

@@ -389,8 +389,6 @@ def execute(argv: list[str]) -> None:
 
             dry_run = action == Action.DRY_BUILD
             no_link = action in (Action.SWITCH, Action.BOOT)
-            build_flags |= {"no_out_link": no_link, "dry_run": dry_run}
-            flake_build_flags |= {"no_link": no_link, "dry_run": dry_run}
             rollback = bool(args.rollback)
 
             def validate_image_variant(variants: ImageVariants) -> None:
@@ -444,29 +442,32 @@ def validate_image_variant(variants: ImageVariants) -> None:
                         flake,
                         build_host,
                         eval_flags=flake_common_flags,
-                        flake_build_flags=flake_build_flags,
+                        flake_build_flags=flake_build_flags
+                        | {"no_link": no_link, "dry_run": dry_run},
                         copy_flags=copy_flags,
                     )
                 case (_, False, None, Flake(_)):
                     path_to_config = nix.build_flake(
                         attr,
                         flake,
-                        flake_build_flags=flake_build_flags,
+                        flake_build_flags=flake_build_flags
+                        | {"no_link": no_link, "dry_run": dry_run},
                     )
                 case (_, False, Remote(_), None):
                     path_to_config = nix.build_remote(
                         attr,
                         build_attr,
                         build_host,
-                        instantiate_flags=common_flags,
+                        realise_flags=common_flags,
+                        instantiate_flags=build_flags,
                         copy_flags=copy_flags,
-                        build_flags=build_flags,
                     )
                 case (_, False, None, None):
                     path_to_config = nix.build(
                         attr,
                         build_attr,
-                        build_flags=build_flags,
+                        build_flags=build_flags
+                        | {"no_out_link": no_link, "dry_run": dry_run},
                     )
                 case never:
                     # should never happen, but mypy is not smart enough to

pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py

@@ -8,7 +8,7 @@
 from pathlib import Path
 from string import Template
 from subprocess import PIPE, CalledProcessError
-from typing import Final
+from typing import Final, Literal
 from uuid import uuid4
 
 from . import tmpdir
@@ -77,7 +77,7 @@ def build_remote(
     attr: str,
     build_attr: BuildAttr,
     build_host: Remote | None,
-    build_flags: Args | None = None,
+    realise_flags: Args | None = None,
     instantiate_flags: Args | None = None,
     copy_flags: Args | None = None,
 ) -> Path:
@@ -112,7 +112,7 @@ def build_remote(
                 drv,
                 "--add-root",
                 remote_tmpdir / uuid4().hex,
-                *dict_to_flags(build_flags),
+                *dict_to_flags(realise_flags),
             ],
             remote=build_host,
             stdout=PIPE,
@@ -554,7 +554,7 @@ def set_profile(
 
 def switch_to_configuration(
     path_to_config: Path,
-    action: Action,
+    action: Literal[Action.SWITCH, Action.BOOT, Action.TEST, Action.DRY_ACTIVATE],
     target_host: Remote | None,
     sudo: bool,
     install_bootloader: bool = False,