Skip to content

fix: keep the input list apart from the cache helper in the flake check #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Muddyblack merged 1 commit into from
Oct 19, 2026
Merged

fix: keep the input list apart from the cache helper in the flake check #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package/contents/ui/Engine.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1907,7 +1907,7 @@ Item {
root.isCheckingFlake = true;
const epoch = root.flakeEpoch;
const settingsKey = root.probeSettingsKey;
const probeEnv = "NIXDATIFIER_CHECK_TARBALLS=" + (root.settings.checkTarballs ? "on " : "off ") + "NIXDATIFIER_DEEP_INPUTS=" + (root.settings.deepInputCheck ? "on " : "off ") + "NIXDATIFIER_IGNORE_INPUTS=" + shq(root.settings.ignoredInputs || "");
const probeEnv = "NIXDATIFIER_CHECK_TARBALLS=" + (root.settings.checkTarballs ? "on " : "off ") + "NIXDATIFIER_DEEP_INPUTS=" + (root.settings.deepInputCheck ? "on " : "off ") + "NIXDATIFIER_IGNORE_INPUTS=" + shq(root.settings.ignoredInputs || "") + " ";
sh(probeEnv + shq(root.scriptDir + "run") + " cached " + shq("flake:" + root.flakePath + (probeEnv ? ":" + probeEnv.trim() : "")) + " 30 -- " + shq(root.scriptDir + "flake-probe") + " " + shq(root.flakePath), function (cmd, out, err, code) {
root.isCheckingFlake = false;
if (epoch !== root.flakeEpoch || settingsKey !== root.probeSettingsKey)
Expand Down
13 changes: 13 additions & 0 deletions tests/tst_Engine.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,6 +597,19 @@ Item {
compare(lines[2].split("\t")[0], "hm");
compare(lines[3].split("\t")[0], "extra");
}
function test_flake_check_keeps_the_input_list_apart_from_the_helper() {
// Glued to the assignment, the helper's path became its value and bash ran `cached` (#38).
const original = cfg.ignoredInputs;
for (const list of ["", "nur"]) {
cfg.ignoredInputs = list;
jobs = [];
core.isCheckingFlake = false;
core.checkFlakeUpdates();
compare(jobs.length, 1);
verify(jobs[0].cmd.indexOf("NIXDATIFIER_IGNORE_INPUTS=" + core.shq(list) + " " + core.shq(core.scriptDir + "run") + " cached ") >= 0, jobs[0].cmd);
}
cfg.ignoredInputs = original;
}
function test_putting_inputs_back_probes_only_those() {
cfg.ignoredInputs = "nur,hm";
core.initialized = true;
Expand Down
Loading