lix-project/hydra
3
0
Fork 6
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

Fix build

Browse source
This commit is contained in:
Eelco Dolstra 2020-08-07 21:42:09 +02:00
parent 529a003de5
commit 1113c2895a
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/hydra-eval-jobs/hydra-eval-jobs.cc
View file

@ -469,7 +469,7 @@ int main(int argc, char * * argv)
std::string drvName(drvPath.name()); std::string drvName(drvPath.name());
assert(hasSuffix(drvName, drvExtension)); assert(hasSuffix(drvName, drvExtension));
drvName.resize(drvName.size() - drvExtension.size()); drvName.resize(drvName.size() - drvExtension.size());
auto h = hashDerivationModulo(*store, drv, true); auto h = std::get<Hash>(hashDerivationModulo(*store, drv, true));
auto outPath = store->makeOutputPath("out", h, drvName); auto outPath = store->makeOutputPath("out", h, drvName);
drv.env["out"] = store->printStorePath(outPath); drv.env["out"] = store->printStorePath(outPath);
drv.outputs.insert_or_assign("out", DerivationOutput { .output = DerivationOutputInputAddressed { .path = outPath } }); drv.outputs.insert_or_assign("out", DerivationOutput { .output = DerivationOutputInputAddressed { .path = outPath } });

2
src/hydra-queue-runner/build-remote.cc
View file

@ -452,7 +452,7 @@ void State::buildRemote(ref<Store> destStore,
readLongLong(from); // download size readLongLong(from); // download size
info.narSize = readLongLong(from); info.narSize = readLongLong(from);
totalNarSize += info.narSize; totalNarSize += info.narSize;
info.narHash = Hash(readString(from), htSHA256); info.narHash = Hash::parseAny(readString(from), htSHA256);
info.ca = parseContentAddressOpt(readString(from)); info.ca = parseContentAddressOpt(readString(from));
readStrings<StringSet>(from); // sigs readStrings<StringSet>(from); // sigs
infos.insert_or_assign(info.path, info); infos.insert_or_assign(info.path, info);

2
src/hydra-queue-runner/queue-monitor.cc
View file

@ -649,7 +649,7 @@ BuildOutput State::getBuildOutputCached(Connection & conn, nix::ref<nix::Store>
product.fileSize = row[2].as<off_t>(); product.fileSize = row[2].as<off_t>();
} }
if (!row[3].is_null()) if (!row[3].is_null())
product.sha256hash = Hash(row[3].as<std::string>(), htSHA256); product.sha256hash = Hash::parseAny(row[3].as<std::string>(), htSHA256);
if (!row[4].is_null()) if (!row[4].is_null())
product.path = row[4].as<std::string>(); product.path = row[4].as<std::string>();
product.name = row[5].as<std::string>(); product.name = row[5].as<std::string>();