lix-project/lix
20
57
Fork 31
Code Issues 349 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge pull request #8490 from flox/stdin_handling

Browse source 
fix: Do not apply default installables when using --stdin
This commit is contained in:
John Ericson 2023-06-14 20:41:22 +02:00 committed by GitHub
parent 37bffbc28f 0e3849dc65
commit 05eb06a1de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libcmd/installables.cc
View file

@ -701,7 +701,7 @@ RawInstallablesCommand::RawInstallablesCommand()
{ {
addFlag({ addFlag({
.longName = "stdin", .longName = "stdin",
.description = "Read installables from the standard input.", .description = "Read installables from the standard input. No default installable applied.",
.handler = {&readFromStdIn, true} .handler = {&readFromStdIn, true}
}); });
@ -730,9 +730,9 @@ void RawInstallablesCommand::run(ref<Store> store)
while (std::cin >> word) { while (std::cin >> word) {
rawInstallables.emplace_back(std::move(word)); rawInstallables.emplace_back(std::move(word));
} }
} } else {
applyDefaultInstallables(rawInstallables); applyDefaultInstallables(rawInstallables);
}
run(store, std::move(rawInstallables)); run(store, std::move(rawInstallables));
} }

4
tests/build.sh
View file

@ -129,3 +129,7 @@ nix build --impure -f multiple-outputs.nix --json e --no-link | jq --exit-status
(.drvPath | match(".*multiple-outputs-e.drv")) and (.drvPath | match(".*multiple-outputs-e.drv")) and
(.outputs | keys == ["a_a", "b"])) (.outputs | keys == ["a_a", "b"]))
' '
# Make sure that `--stdin` works and does not apply any defaults
printf "" | nix build --no-link --stdin --json | jq --exit-status '. == []'
printf "%s\n" "$drv^*" | nix build --no-link --stdin --json | jq --exit-status '.[0]|has("drvPath")'