wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 23:11:16 +02:00
Code Activity

Merge remote-tracking branch 'upstream/master' into indexed-store-path-outputs

Browse source
This commit is contained in:
John Ericson 2022-12-12 17:36:02 -05:00
commit dabb03b8d0
62 changed files with 406 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libcmd/installables.cc
View file

@ -793,7 +793,8 @@ std::vector<std::shared_ptr<Installable>> SourceExprCommand::parseInstallables(
if (file == "-") {
auto e = state->parseStdin();
state->eval(e, *vFile);
} else if (file)
}
else if (file)
state->evalFile(lookupFileArg(*state, *file), *vFile);
else {
auto e = state->parseExprFromString(*expr, absPath("."));