-
-
Notifications
You must be signed in to change notification settings - Fork 14.4k
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: handle *Phases variables __structuredAttrs-agnostically (round 2) #352709
base: staging
Are you sure you want to change the base?
Conversation
160b7f1
to
292a749
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should not introduce any new helper to stdenv here, but instead fix the 4 cases "properly" as suggested in the other comments. This will remove all those hacks depending on order of the preXPhases
.
I opened #360450 to address those special cases. If we do this, then we don't need introduce any new helpers here. |
292a749
to
2db8439
Compare
@wolfgangwalther Thank you for fixing them. I dropped the commits already adjusted by #360450. |
There are still a lot of rebuilds. I'll re-target this feature branch to staging. |
2db8439
to
01dc95c
Compare
This PR clears the remaining non-
__structuredAttrs
-agnostic appending to the*Phase
list not caught by #339117.For the "insert the new phase before certain phase" operation, this commit adds a new Bash function
replaceElement
tosetup.sh
to provide a more graceful solution to the string-replacement hack in #339117 and previous implementations. (Previous discussion: #339117 (comment)).Cc: @philiptaron @wolfgangwalther
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.