From 12e016d32db7b271c1985e8f3e29a441d3d99845 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 24 Jun 2025 15:49:24 +0100 Subject: [PATCH] nixos-rebuild-ng: add FLAKE_FLAGS to `nix copy` --- pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py | 1 + pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py | 2 ++ pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py | 2 ++ 3 files changed, 5 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 acc9448fec00..0d8abca0f92d 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 @@ -210,6 +210,7 @@ def copy_closure( run_wrapper( [ "nix", + *FLAKE_FLAGS, "copy", *dict_to_flags(copy_flags), "--from", 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 504d016bbfbb..e3678420bc14 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 @@ -688,6 +688,8 @@ def test_execute_nix_switch_build_target_host( call( [ "nix", + "--extra-experimental-features", + "nix-command flakes", "copy", "--from", "ssh://user@build-host", 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 05cb69e69d8b..1bca16260012 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 @@ -263,6 +263,8 @@ def test_copy_closure(monkeypatch: MonkeyPatch) -> None: mock_run.assert_called_with( [ "nix", + "--extra-experimental-features", + "nix-command flakes", "copy", "--copy-flag", "--from",