aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreldritch horrors <pennae@lix.systems>2024-03-04 07:13:33 +0100
committereldritch horrors <pennae@lix.systems>2024-03-04 07:13:33 +0100
commitbc34274aae277bb5b05d3e833fbdc0bd30c7250a (patch)
tree0efc8d4cbd8c38ca4608111eb7b16e6631d3bb17
parentfa03f239239e516a3585f9323d0eff7787fc999f (diff)
Merge pull request #9588 from obsidiansystems/queryDerivationOutputMap-evalStore
Give `Store::queryDerivationOutputMap` and `evalStore` argument (cherry picked from commit 8cddda4f892cb42be43e9bd87aa0111572617e78) Change-Id: I394e7e11c3f2e0cd3dbe0f48d757c14c09835e44
-rw-r--r--src/libstore/store-api.cc4
-rw-r--r--src/libstore/store-api.hh2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index 2851133d4..484a0ca6e 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -539,8 +539,8 @@ std::map<std::string, std::optional<StorePath>> Store::queryPartialDerivationOut
return outputs;
}
-OutputPathMap Store::queryDerivationOutputMap(const StorePath & path) {
- auto resp = queryPartialDerivationOutputMap(path);
+OutputPathMap Store::queryDerivationOutputMap(const StorePath & path, Store * evalStore) {
+ auto resp = queryPartialDerivationOutputMap(path, evalStore);
OutputPathMap result;
for (auto & [outName, optOutPath] : resp) {
if (!optOutPath)
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index da1a3eefb..87fb4c04e 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -457,7 +457,7 @@ public:
* Query the mapping outputName=>outputPath for the given derivation.
* 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