max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-29 09:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9588 from obsidiansystems/queryDerivationOutputMap-evalStore

Browse source 
Give `Store::queryDerivationOutputMap` and `evalStore` argument
This commit is contained in:
John Ericson 2023-12-11 11:16:18 -05:00 committed by GitHub
commit 8cddda4f89
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

@ -547,8 +547,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

@ -369,7 +369,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