Skip to content

Comments

treewide: fix some more sourceRoots#391287

Merged
mkg20001 merged 1 commit intoNixOS:masterfrom
oxij:tree/source-root-continues-4
Mar 23, 2025
Merged

treewide: fix some more sourceRoots#391287
mkg20001 merged 1 commit intoNixOS:masterfrom
oxij:tree/source-root-continues-4

Conversation

@oxij
Copy link
Member

@oxij oxij commented Mar 19, 2025 •
edited
Loading

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 Python is a high-level, general-purpose programming language. 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

@github-actions github-actions bot added 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Mar 19, 2025
@oxij oxij force-pushed the tree/source-root-continues-4 branch from 7374a4c to d11f8f6 Compare March 19, 2025 14:52
@github-actions github-actions bot added 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. and removed 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. labels Mar 19, 2025
@nix-owners nix-owners bot requested review from makefu and mkg20001 March 19, 2025 15:00
toastal
toastal reviewed Mar 19, 2025
View reviewed changes
@oxij oxij force-pushed the tree/source-root-continues-4 branch from d11f8f6 to 972ace3 Compare March 19, 2025 17:37
drupol
drupol requested changes Mar 20, 2025
View reviewed changes
@oxij
treewide: fix some more sourceRoots
992f592 
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
drupol
drupol approved these changes Mar 20, 2025
View reviewed changes
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 •
edited
Loading

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.

toonn
toonn approved these changes Mar 20, 2025
View reviewed changes
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 persons. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Mar 21, 2025
@nixos-discourse
Copy link

nixos-discourse commented Mar 21, 2025

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

Reviewers

@drupol drupol drupol approved these changes

@toonn toonn toonn approved these changes

@emilazy emilazy Awaiting requested review from emilazy

@reckenrode reckenrode Awaiting requested review from reckenrode

@ttuegel ttuegel Awaiting requested review from ttuegel

@K900 K900 Awaiting requested review from K900

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

@NickCao NickCao Awaiting requested review from NickCao

@mkg20001 mkg20001 Awaiting requested review from mkg20001

@makefu makefu Awaiting requested review from makefu

+1 more reviewer

@toastal toastal toastal left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: coq A formal proof management system 6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approvals: 2 This PR was reviewed and approved by two persons. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@oxij @reckenrode @K900 @nixos-discourse @drupol @toastal @toonn @mkg20001 @wegank