From dc0f2638f396f0d676347c149f159dc184ecc6dc Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 12 Feb 2026 17:53:57 +0000 Subject: [PATCH] nixos-rebuild-ng: add missing FLAKE_FLAGS in `nix eval` calls --- pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py | 2 ++ pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py | 4 ++++ pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py | 2 ++ 3 files changed, 8 insertions(+) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index 2804ea94a7b2..9544a393fb61 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -314,6 +314,7 @@ def get_build_image_name_flake( r = run_wrapper( [ "nix", + *FLAKE_FLAGS, "eval", "--json", flake.to_attr( @@ -365,6 +366,7 @@ def get_build_image_variants_flake( r = run_wrapper( [ "nix", + *FLAKE_FLAGS, "eval", "--json", flake.to_attr("config.system.build.images"), diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index 8d922809b05d..5a9f61be1f25 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -386,6 +386,8 @@ def test_execute_nix_build_image_flake(mock_run: Mock, tmp_path: Path) -> None: call( [ "nix", + "--extra-experimental-features", + "nix-command flakes", "eval", "--json", '/path/to/config#nixosConfigurations."hostname".config.system.build.images', @@ -412,6 +414,8 @@ def test_execute_nix_build_image_flake(mock_run: Mock, tmp_path: Path) -> None: call( [ "nix", + "--extra-experimental-features", + "nix-command flakes", "eval", "--json", '/path/to/config#nixosConfigurations."hostname".config.system.build.images.azure.passthru.filePath', diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index 69d29422337a..de70cd7723fe 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -394,6 +394,8 @@ def test_get_build_image_variants_flake(mock_run: Mock) -> None: mock_run.assert_called_with( [ "nix", + "--extra-experimental-features", + "nix-command flakes", "eval", "--json", "/flake.nix#myAttr.config.system.build.images",