treewide: mostly noop: refer to src.name or similar in sourceRoot where appropriate, part 3#247977
Merged
AndersonTorres merged 3 commits intoNixOS:masterfrom Aug 11, 2023
Merged
Conversation
src.name or similar in sourceRoot where appropriate, part 2src.name or similar in sourceRoot where appropriate, part 3
Member
Author
AndersonTorres
suggested changes
Aug 9, 2023
20784f4 to
ec576fb
Compare
…t 3: more use cases This continues where d8f7f6a left off. Similarly to that commit, this commit this also points `sourceRoot`s to `src.name` and similar instead of keeping hardcoded names, and edits other derivation attrs do do the same, where appropriate. Also, similarly to d8f7f6a some of expressions this edits use `srcs` attribute with customly-named sources, so they have to be moved into `let` blocks to keep evaluation efficient (the other, worse, way to do this would to recurcively refer to `elemAt n finalAttrs.srcs` or, similarly, with `rec`).
ec576fb to
da004a1
Compare
AndersonTorres
approved these changes
Aug 10, 2023
Member
Author
|
So, could someone merge this, please? I have two more of these in the queue... |
Member
Author
|
Thanks, @AndersonTorres! Follow-up PR #248528, the last one that is mostly-noop. They are getting smaller with each step, hurray! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Continues where #245388 left off.
This replaces many static source paths in derivation's
sourceRootand related attributes with references tosrc.nameand similar.It's a noop build-wise except for the last commit which only rebuilds
keeperrl(I couldn't help myself there).