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

Handle derivation

Browse source
This commit is contained in:
Eelco Dolstra 2025-05-07 20:56:41 +02:00
parent 8739d35529
commit 0f48a152dd
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/libexpr/primops.cc
View file

@ -90,7 +90,7 @@ StringMap EvalState::realiseContext(const NixStringContext & context, StorePathS
maybePathsOut->emplace(d.drvPath); maybePathsOut->emplace(d.drvPath);
}, },
[&](const NixStringContextElem::Path & p) { [&](const NixStringContextElem::Path & p) {
// FIXME // FIXME: do something?
}, },
}, c.raw); }, c.raw);
} }
@ -1417,6 +1417,8 @@ static void derivationStrictInternal(
derivation. */ derivation. */
StringMap rewrites; StringMap rewrites;
std::optional<std::string> drvS;
for (auto & c : context) { for (auto & c : context) {
std::visit(overloaded { std::visit(overloaded {
/* Since this allows the builder to gain access to every /* Since this allows the builder to gain access to every
@ -1442,7 +1444,15 @@ static void derivationStrictInternal(
drv.inputSrcs.insert(state.devirtualize(o.path, &rewrites)); drv.inputSrcs.insert(state.devirtualize(o.path, &rewrites));
}, },
[&](const NixStringContextElem::Path & p) { [&](const NixStringContextElem::Path & p) {
// FIXME: do something if (!drvS) drvS = drv.unparse(*state.store, true);
if (drvS->find(p.storePath.to_string()) != drvS->npos) {
auto devirtualized = state.devirtualize(p.storePath, &rewrites);
warn(
"Using 'builtins.derivation' to create a derivation named '%s' that references the store path '%s' without a proper context. "
"The resulting derivation will not have a correct store reference, so this is unreliable and may stop working in the future.",
drvName,
state.store->printStorePath(devirtualized));
}
}, },
}, c.raw); }, c.raw);
} }
@ -2359,12 +2369,12 @@ static void prim_toFile(EvalState & state, const PosIdx pos, Value * * args, Val
refs.insert(p->path); refs.insert(p->path);
else if (auto p = std::get_if<NixStringContextElem::Path>(&c.raw)) { else if (auto p = std::get_if<NixStringContextElem::Path>(&c.raw)) {
if (contents.find(p->storePath.to_string()) != contents.npos) { if (contents.find(p->storePath.to_string()) != contents.npos) {
auto devirtualized = state.devirtualize(p->storePath, &rewrites);
warn( warn(
"Using 'builtins.toFile' to create a file named '%s' that references the store path '%s' without a proper context. " "Using 'builtins.toFile' to create a file named '%s' that references the store path '%s' without a proper context. "
"The resulting file will not have a correct store reference, so this is unreliable and may stop working in the future.", "The resulting file will not have a correct store reference, so this is unreliable and may stop working in the future.",
name, name,
state.store->printStorePath(p->storePath)); state.store->printStorePath(devirtualized));
state.devirtualize(p->storePath, &rewrites);
} }
} }
else else