Simplify the handling of the hash modulo #6268
Conversation
|
Mmm first of all, I think (floating) CA derivations has nothing to do with this. It might be good to rename that in a separate commit/PR, and then rework the motivation here. |
|
Aye, part of my is still partial to the original, because while it is more verbose, the Still, I agreed before we could do this that after #6229, and I shouldn't reneg on the deal, so 👍. |
|
master...Ericson2314:remove-the-variant-in-hashmodulo fixed conflicts again. |
|
Note that #6227's |
|
@thufschmitt Can you have a look at the merge conflict? |
Rather than having four different but very similar types of hashes, make
only one, with a tag indicating whether it corresponds to a regular of
deferred derivation.
This implies a slight logical change: The original Nix+multiple-outputs
model assumed only one hash-modulo per derivation. Adding
multiple-outputs CA derivations changed this as these have one
hash-modulo per output. This change is now treating each derivation as
having one hash modulo per output.
This obviously means that we internally loose the guaranty that
all the outputs of input-addressed derivations have the same hash
modulo. But it turns out that it doesn’t matter because there’s nothing
in the code taking advantage of that fact (and it probably shouldn’t
anyways).
The upside is that it is now much easier to work with these hashes, and
we can get rid of a lot of useless `std::visit{ overloaded`.
Co-authored-by: John Ericson <John.Ericson@Obsidian.Systems>
thufschmitt
force-pushed
the
remove-the-variant-in-hashmodulo
branch
from
8aab23c
to
390269e
Compare
Oh thanks, didn’t notice it. Done |
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/tweag-nix-dev-update-27/18433/1 |
Rather than having four different but very similar types of hashes, make
only one, with a tag indicating whether it corresponds to a regular of
deferred derivation.
This implies a slight logical change: The original Nix+multiple-outputs
model assumed only one hash-modulo per derivation. Adding
multiple-outputs CA derivations changed this as these have one
hash-modulo per output. This change is now treating each derivation as
having one hash modulo per output.
This obviously means that we internally loose the guaranty that
all the outputs of input-addressed derivations have the same hash
modulo. But it turns out that it doesn’t matter because there’s nothing
in the code taking advantage of that fact (and it probably shouldn’t
anyways).
The upside is that it is now much easier to work with these hashes, and
we can get rid of a lot of useless
std::visit{ overloaded.