scriptis/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Apply suggestions from code review

Browse source 
Co-Authored-By: Cole Helbling <cole.e.helbling@outlook.com>
This commit is contained in:
John Ericson 2020-03-19 23:37:52 -04:00 committed by GitHub
parent f1cf3ab870
commit d5b3328dd1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libstore/derivations.cc
View file

@ -364,12 +364,12 @@ static DrvHashModulo & pathDerivationModulo(Store & store, const StorePath & drv
/* See the header for interface details. These are the implementation details. /* See the header for interface details. These are the implementation details.
For fixed ouput derivations, each hash in the map is not the For fixed-output derivations, each hash in the map is not the
corresponding output's content hash, but a hash of that hash along corresponding output's content hash, but a hash of that hash along
with other constant data. The key point is that the value is a pure with other constant data. The key point is that the value is a pure
function of the output's contents, and there are no preimage attacks function of the output's contents, and there are no preimage attacks
spoofing an either an output's contents for a derivation, or either spoofing an output's contents for a derivation, or
derivation for an output's contents. spoofing a derivation for an output's contents.
For regular derivations, it looks up each subderivation from its hash For regular derivations, it looks up each subderivation from its hash
and recurs. If the subderivation is also regular, it simply and recurs. If the subderivation is also regular, it simply

10
src/libstore/derivations.hh
View file

@ -100,14 +100,14 @@ typedef std::variant<
specified content hash and hash algorithm. (Currently they must have specified content hash and hash algorithm. (Currently they must have
exactly one output (`out'), which is specified using the `outputHash' exactly one output (`out'), which is specified using the `outputHash'
and `outputHashAlgo' attributes, but the algorithm doesn't assume and `outputHashAlgo' attributes, but the algorithm doesn't assume
this). We don't want changes to such derivations to propagate upwards this.) We don't want changes to such derivations to propagate upwards
through the dependency graph, changing output paths everywhere. through the dependency graph, changing output paths everywhere.
For instance, if we change the url in a call to the `fetchurl' For instance, if we change the url in a call to the `fetchurl'
function, we do not want to rebuild everything depending on it (after function, we do not want to rebuild everything depending on it---after
all, (the hash of) the file being downloaded is unchanged). So the all, (the hash of) the file being downloaded is unchanged. So the
*output paths* should not change. On the other hand, the *derivation *output paths* should not change. On the other hand, the *derivation
paths* should change to reflect the new dependency graph. paths* should change to reflect the new dependency graph.
For fixed output derivations, this returns a map from the names of For fixed output derivations, this returns a map from the names of
each output to hashes unique up to the outputs' contents. each output to hashes unique up to the outputs' contents.