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

Merge pull request #9588 from obsidiansystems/queryDerivationOutputMap-evalStore

Browse source 
Give `Store::queryDerivationOutputMap` and `evalStore` argument

(cherry picked from commit 8cddda4f892cb42be43e9bd87aa0111572617e78)
Change-Id: I394e7e11c3f2e0cd3dbe0f48d757c14c09835e44
This commit is contained in:
eldritch horrors 2024-03-04 07:13:33 +01:00
parent fa03f23923
commit bc34274aae
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/store-api.cc
View file

@ -539,8 +539,8 @@ std::map<std::string, std::optional<StorePath>> Store::queryPartialDerivationOut
return outputs; return outputs;
} }
OutputPathMap Store::queryDerivationOutputMap(const StorePath & path) { OutputPathMap Store::queryDerivationOutputMap(const StorePath & path, Store * evalStore) {
auto resp = queryPartialDerivationOutputMap(path); auto resp = queryPartialDerivationOutputMap(path, evalStore);
OutputPathMap result; OutputPathMap result;
for (auto & [outName, optOutPath] : resp) { for (auto & [outName, optOutPath] : resp) {
if (!optOutPath) if (!optOutPath)

2
src/libstore/store-api.hh
View file

@ -457,7 +457,7 @@ public:
* Query the mapping outputName=>outputPath for the given derivation. * Query the mapping outputName=>outputPath for the given derivation.
* Assume every output has a mapping and throw an exception otherwise. * Assume every output has a mapping and throw an exception otherwise.
*/ */
OutputPathMap queryDerivationOutputMap(const StorePath & path); OutputPathMap queryDerivationOutputMap(const StorePath & path, Store * evalStore = nullptr);
/** /**
* Query the full store path given the hash part of a valid store * Query the full store path given the hash part of a valid store