Realisations use regular drv paths again#12464
Conversation
6f610de to
be5cfe4
Compare
be5cfe4 to
7b01c8b
Compare
7b01c8b to
546d826
Compare
a031df7 to
4f9435b
Compare
4f9435b to
46fde9b
Compare
46fde9b to
d150215
Compare
9f3fdcf to
c9ac039
Compare
e0eb7f7 to
aa43f8d
Compare
aa43f8d to
043eed8
Compare
|
I applied an earlier version of this PR https://github.com/Mic92/nix-1/tree/broken-main |
|
when I applied this pr, After dropping the patches from my fork, it does again. This happened with all nix versions I tested btw, while the faulty version was running as the nix-daemon. |
4cf2e4f to
d9e2cd8
Compare
ebc5b58 to
211dc75
Compare
src/libstore-tests/realisation.cc
Outdated
| Realisation simple{ | ||
| { | ||
| .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"}, | ||
| }, | ||
| { | ||
| .drvPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv"}, | ||
| .outputName = "foo", | ||
| }, | ||
| }; |
There was a problem hiding this comment.
Can move this back outside, like it was before this commit.
d21cbe2 to
770a5f5
Compare
Fix NixOS#11897 As described in the issue, this makes for a simpler and much more intuitive notion of a realisation key. This is better for pedagogy, and interoperability between more tools. The way the issue was written was that we would switch to only having shallow realisations first, and then do this. But going to only shallow realisations is more complex change, and it turns out we weren't even testing for the benefits that derivation hashes (modulo FODs) provided in the deep realisation case, so I now just want to do this first. Doing this gets the binary cache data structures in order, which will unblock the Hydra fixed-output-derivation tracking work. I don't want to delay that work while I figure out the changes needed for shallow-realisations only. This reverts commit bab1cda. Co-authored-by: Amaan Qureshi <git@amaanq.com>
770a5f5 to
4f91e95
Compare
Actually, I thought, I was no longer able to reproduce the bug, but I just now still able to reproduce this. But only with older nix versions, not with the current nix version. |
|
Ah. Actually even with the same nix version... |
Motivation
Fix #11897
As described in the issue, this makes for a simpler and much more intuitive notion of a realisation key. This is better for pedagogy, and interoperability between more tools.
Context
The way the issue was written was that we would switch to only having shallow realisations first, and then do this. But going to only shallow realisations is more complex change, and it turns out we weren't even testing for the benefits that derivation hashes (modulo FODs) provided in the deep realisation case, so I now just want to do this first.
Doing this gets the binary cache data structures in order, which will unblock the Hydra fixed-output-derivation tracking work. I don't want to delay that work while I figure out the changes needed for shallow-realisations only.
Revert "Use the hash modulo in the derivation outputs"
This reverts commit bab1cda.
Depends on #14247
Depends on #14257
Depends on #14648
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.