Merged
Conversation
roberth
reviewed
May 12, 2025
MattSturgeon
force-pushed
the
relative-path
branch
from
6ad61e7 to
8e15e2c
Compare
This comment was marked as off-topic.
This comment was marked as off-topic.
2 tasks
MattSturgeon
force-pushed
the
relative-path
branch
from
8e15e2c to
3881c71
Compare
This comment was marked as outdated.
This comment was marked as outdated.
MattSturgeon
force-pushed
the
relative-path
branch
2 times, most recently
from
2ab3599 to
1b0e1a7
Compare
This comment was marked as outdated.
This comment was marked as outdated.
5 tasks
(cherry picked from PR NixOS/nix#10089)
(cherry picked from commit NixOS/nix@674375b) (cherry picked from PR NixOS/nix#13026)
(cherry picked from commit NixOS/nix@9de9410) (cherry picked from PR NixOS/nix#13026)
This requires that we refer to the `sourceInfo` instead of the `result`. However, `sourceInfo` does not create a chain of basedir resolution, so we add that back with `flakeDir`. (cherry picked from commit NixOS/nix@2109a5a) (cherry picked from PR NixOS/nix#13026)
Ensure relative path inputs are relative to the parent node's _actual_ `outPath`, instead of the subtly different `sourceInfo.outPath`. Additionally, non-flake inputs now also have a `sourceInfo` attribute. This fixes the relationship between `self.outPath` and `self.sourceInfo.outPath` in some edge cases. (cherry picked from commit NixOS/nix@46beb9a) (cherry picked from PR NixOS/nix#13170)
MattSturgeon
force-pushed
the
relative-path
branch
from
1b0e1a7 to
77a761e
Compare
Contributor
Author
|
With NixOS/nix#13164 fixed, I've updated this PR to include all the relevant patches, cherry picked from https://github.com/NixOS/nix. |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This was referenced Jun 27, 2025
Member
|
@MattSturgeon Would you be interested in porting this to https://git.lix.systems/lix-project/flake-compat as well? Lix currently lacks an implementation for relative path inputs so this patch would be a valuable addition. Also, the fork contains some extra goodies such as an ad-hoc "lazy-trees" implementation 😜 |
|
This is important and looking forward to see it gets merged |
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
5 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.
Cherry-pick the relative path inputs implementation from upstream nix.
Cherry-picked relevant patches from:
sourceInfostrict inoutputsnix#13026 (2.28)outPathfor relative path inputs nix#13170 (2.30)The only significant diff conflict were:
This supersedes and closes #18
cc @edolstra @roberth @BBBSnowball