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

Revert "Revert "Merge pull request #6204 from layus/coerce-string""

Browse source 
This reverts commit 9b33ef3879.
This commit is contained in:
Guillaume Maudoux 2023-01-19 13:23:04 +01:00
parent 38b90c618f
commit e4726a0c79
31 changed files with 986 additions and 863 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libcmd/installables.cc
View file

@ -554,7 +554,7 @@ ref<eval_cache::EvalCache> openEvalCache(
auto vFlake = state.allocValue();
flake::callFlake(state, *lockedFlake, *vFlake);
state.forceAttrs(*vFlake, noPos);
state.forceAttrs(*vFlake, noPos, "while parsing cached flake data");
auto aOutputs = vFlake->attrs->get(state.symbols.create("outputs"));
assert(aOutputs);
@ -618,7 +618,7 @@ DerivedPathsWithInfo InstallableFlake::toDerivedPaths()
else if (v.type() == nString) {
PathSet context;
auto s = state->forceString(v, context, noPos);
auto s = state->forceString(v, context, noPos, fmt("while evaluating the flake output attribute '%s'", attrPath));
auto storePath = state->store->maybeParseStorePath(s);
if (storePath && context.count(std::string(s))) {
return {{