Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consistent relative paths to expression file #33

Merged
merged 3 commits into from
Apr 4, 2024

Conversation

willbush
Copy link
Member

@willbush willbush commented Apr 4, 2024

馃殌 Catalyst

#2 (comment)

馃搩 Description

PR has changes needed to output error messages with paths relative to expression
file instead of nixpkgs root.

  • tests: move all-packages.nix to pkgs/top-level

    In this commit I move all the tests/*/all-packages.nix to tests/*/pkgs/top-level/all-packages.nix without changing any code (breaking a lot of tests).

    The reason for this commit is to make it more obvious in the expected files results where changes where needed to get ./pkgs/by-name to become ./../by-name

  • Fix relative paths in all-packages.nix files and expected outputs

    This commit just gets tests passing again before I start modifying other code.

  • Update errors paths to be relative to the expression file

    Most changes are here to use relative paths to expression file in all cases.

@willbush willbush requested a review from a team as a code owner April 4, 2024 03:17
@willbush
Copy link
Member Author

willbush commented Apr 4, 2024

Annoying. I thought moving files in one commit without modifying meant git would detect it as a move. Guess I should have used git mv explicitly. Should I bother trying to fix it?

@infinisil
Copy link
Member

If you look at the diff commit-by-commit it works, so that seems fine to me :)

Copy link
Member

@infinisil infinisil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me, thanks a lot!

@infinisil infinisil merged commit 7f0c106 into NixOS:main Apr 4, 2024
1 check passed
@willbush willbush deleted the feauter/consistent-relative-paths branch May 19, 2024 04:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants