From d36d2e631e4baceed0a8c0c00859ebb2ab8cb82f Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 13 Nov 2026 21:28:11 +0100 Subject: populate: drop the shell implementation Populate is the program in Rust only. pkgs.populate checks its arguments, and returns a script running the program with them as JSON. The arguments it took for the shell implementation, dash, jq, and implementation, stay accepted and unused, so overrides setting them keep working. Copying flakes to remote targets using sudo gets refused during evaluation, as before, by checks.nix, and by the program for specs from elsewhere. The jq test goes with the jq programs; the program's unit tests cover their equivalents. --- tests/scenarios.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'tests/scenarios.nix') diff --git a/tests/scenarios.nix b/tests/scenarios.nix index cda72bd..14a2c91 100644 --- a/tests/scenarios.nix +++ b/tests/scenarios.nix @@ -28,8 +28,6 @@ gitFirst, # Version of rsync on the deploying machine. rsyncVersion, - # The implementation of populate, "shell" or "rust". - implementation, }: let @@ -230,16 +228,12 @@ let then options // { fetchOnTarget = true; } else options)); - # A phase copying flakes to a target using sudo, which isn't supported: - # the shell implementation refuses during evaluation, the Rust one when it - # runs, because only then it decides whether the target is local. - refuseCopyingWithSudo = - if implementation == "shell" then { - expect = "eval-error"; - control = withFetchOnTarget; - } else { - expect.fail = "copying flakes to targets with sudo is not supported"; - }; + # A phase copying flakes to a target using sudo, which isn't supported, + # and gets refused during evaluation. + refuseCopyingWithSudo = { + expect = "eval-error"; + control = withFetchOnTarget; + }; in -- cgit v1.3.1