kloenk/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

exportReferencesGraph: Allow exporting a list of store paths

Browse source
This commit is contained in:
Eelco Dolstra 2017-10-25 15:18:49 +02:00
parent 8191992c83
commit 82327e3cc4
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
2 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/libstore/build.cc
View file

@ -1742,24 +1742,29 @@ int childEntry(void * arg)
} }
PathSet exportReferences(Store & store, Path storePath) PathSet exportReferences(Store & store, PathSet storePaths)
{ {
/* Check that the store path is valid. */ PathSet paths;
if (!store.isInStore(storePath))
throw BuildError(format("'exportReferencesGraph' contains a non-store path '%1%'") for (auto storePath : storePaths) {
% storePath);
storePath = store.toStorePath(storePath); /* Check that the store path is valid. */
if (!store.isValidPath(storePath)) if (!store.isInStore(storePath))
throw BuildError(format("'exportReferencesGraph' contains an invalid path '%1%'") throw BuildError(format("'exportReferencesGraph' contains a non-store path '%1%'")
% storePath); % storePath);
storePath = store.toStorePath(storePath);
if (!store.isValidPath(storePath))
throw BuildError(format("'exportReferencesGraph' contains an invalid path '%1%'")
% storePath);
store.computeFSClosure(storePath, paths);
}
/* If there are derivations in the graph, then include their /* If there are derivations in the graph, then include their
outputs as well. This is useful if you want to do things outputs as well. This is useful if you want to do things
like passing all build-time dependencies of some path to a like passing all build-time dependencies of some path to a
derivation that builds a NixOS DVD image. */ derivation that builds a NixOS DVD image. */
PathSet paths, paths2; PathSet paths2(paths);
store.computeFSClosure(storePath, paths);
paths2 = paths;
for (auto & j : paths2) { for (auto & j : paths2) {
if (isDerivation(j)) { if (isDerivation(j)) {
@ -1868,7 +1873,7 @@ void DerivationGoal::startBuilder()
/* Write closure info to <fileName>. */ /* Write closure info to <fileName>. */
writeFile(tmpDir + "/" + fileName, writeFile(tmpDir + "/" + fileName,
worker.store.makeValidityRegistration( worker.store.makeValidityRegistration(
exportReferences(worker.store, storePath), false, false)); exportReferences(worker.store, {storePath}), false, false));
} }
} }
@ -2366,8 +2371,11 @@ void DerivationGoal::writeStructuredAttrs()
std::ostringstream str; std::ostringstream str;
{ {
JSONPlaceholder jsonRoot(str, true); JSONPlaceholder jsonRoot(str, true);
PathSet storePaths;
for (auto & p : *i)
storePaths.insert(p.get<std::string>());
worker.store.pathInfoToJSON(jsonRoot, worker.store.pathInfoToJSON(jsonRoot,
exportReferences(worker.store, i->get<std::string>()), false, true); exportReferences(worker.store, storePaths), false, true);
} }
json[i.key()] = nlohmann::json::parse(str.str()); // urgh json[i.key()] = nlohmann::json::parse(str.str()); // urgh
} }

2
tests/structured-attrs.nix
View file

@ -62,5 +62,5 @@ mkDerivation {
"1foobar" = "BAD"; "1foobar" = "BAD";
"foo$" = "BAD"; "foo$" = "BAD";
exportReferencesGraph.refs = dep; exportReferencesGraph.refs = [ dep ];
} }