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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

treewide: fix some more sourceRoots #391287

Merged
merged 1 commit into from
Mar 23, 2025

Conversation

oxij
Copy link
Member

@oxij oxij commented Mar 19, 2025

Continuation of #248528 with more things that were since discovered to be broken with non-default values of config.fetchedSourceNameDefault of #49862.

I.e. this replaces more references to fetchzip's "source" in sourceRoot package attribute with src.name and similar.

Should be a noop (up to some tiny changes causing micro-rebuilds).

@github-actions github-actions bot added 6.topic: python 6.topic: coq "A formal proof management system" labels Mar 19, 2025
@oxij oxij force-pushed the tree/source-root-continues-4 branch from 513fdaf to 7374a4c Compare March 19, 2025 14:25
@oxij
Copy link
Member Author

oxij commented Mar 19, 2025

/cc @AndersonTorres @drupol

@oxij oxij force-pushed the tree/source-root-continues-4 branch from d11f8f6 to 972ace3 Compare March 19, 2025 17:37
This change is almost a noop.
@oxij oxij force-pushed the tree/source-root-continues-4 branch from 972ace3 to 992f592 Compare March 20, 2025 11:59
Copy link
Contributor

@drupol drupol left a comment

Choose a reason for hiding this comment

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

Thank you !

@reckenrode
Copy link
Contributor

reckenrode commented Mar 20, 2025

This needs to target staging. Changing xar and darwin.locale is a whole rebootstrap of Darwin.

@K900
Copy link
Contributor

K900 commented Mar 20, 2025

It's a no-op unless you enable the source renaming.

@oxij
Copy link
Member Author

oxij commented Mar 20, 2025

It substitutes the same "source" string in both cases by default, so it's a noop by default.

It is not a noop where I removed ./ from the beginning of sourceRoot, but I only did that for leaf packages.

Copy link
Contributor

@toonn toonn left a comment

Choose a reason for hiding this comment

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

LGTM

@wegank wegank added 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Mar 21, 2025
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/2314

@oxij
Copy link
Member Author

oxij commented Mar 23, 2025

ping?

@mkg20001 mkg20001 merged commit 9ca78d0 into NixOS:master Mar 23, 2025
29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: coq "A formal proof management system" 6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants