wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 08:31:16 +02:00
Code Activity

Merge remote-tracking branch 'origin/master' into substitute-other-storedir

Browse source
This commit is contained in:
Matthew Bauer 2020-06-22 13:08:11 -04:00
commit 66a62b3189
29 changed files with 278 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/libstore/misc.cc
View file

@ -108,28 +108,11 @@ void Store::computeFSClosure(const StorePath & startPath,
}
std::optional<std::string> getDerivationCA(const BasicDerivation & drv)
std::optional<ContentAddress> getDerivationCA(const BasicDerivation & drv)
{
auto outputHashMode = drv.env.find("outputHashMode");
auto outputHash = drv.env.find("outputHash");
std::optional<HashType> ht = std::nullopt;
auto outputHashAlgo = drv.env.find("outputHashAlgo");
if (outputHashAlgo != drv.env.end())
ht = parseHashTypeOpt(outputHashAlgo->second);
if (outputHashMode != drv.env.end() && outputHash != drv.env.end()) {
auto h = Hash(outputHash->second, ht);
FileIngestionMethod ingestionMethod;
if (outputHashMode->second == "recursive")
ingestionMethod = FileIngestionMethod::Recursive;
else if (outputHashMode->second == "flat")
ingestionMethod = FileIngestionMethod::Flat;
else
throw Error("unknown outputHashMode: '%s'", outputHashMode->second);
return makeFixedOutputCA(ingestionMethod, h);
}
auto out = drv.outputs.find("out");
if (out != drv.outputs.end())
return out->second.hash;
return std::nullopt;
}