-
-
Notifications
You must be signed in to change notification settings - Fork 14.2k
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: stdenv.is -> stdenv.hostPlatform.is #356363
Conversation
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { | |||
|
|||
buildInputs = | |||
[ sqlite ] | |||
++ lib.optionals stdenv.isLinux [ openssl ] |
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.
These sneaked back in 5136e37 lol
Just do the commands in #341407 instead of only isLinux |
I am unsure about the second commit here. Is it going to work with cross? Don’t we want a |
However not sure if it's added when doing overrideAttrs like done in lua-modules |
OKAY I fundamentally misunderstood I believe, let's change it back to hostPlatform |
e2e94b9
to
86bb979
Compare
Formatter is unhappy. |
Not related to this PR, the errors are occuring as the original files are not formatted. We are only touching a line, formatting them here is out of scope |
CI only complains if files that were formatted before the PR become unformatted, so I don’t think that’s true. |
It complains about |
Yeah, it seems like nixfmt will throw errors if line char limits have been exceeded and use an alternate style. Done, this should make the CI happy, I have still decided to make the commit seperately though, for easier skimming through the diff. The PR can be squash merged if needed. |
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.
Eval successfully passed but a merge conflict is shown. Intend to merge after rebasing, as while we race for the eval to complete again likely another conflict will arise
c5724ef
to
dc4edb3
Compare
Commands ran:
Following #341407
stdenv.isLinux
->stdenv.hostPlatform.isLinux
, is pretty much easy expansion of alias. This should cause no rebuilds.However some packages have stdenv.isLinux indoCheck
, meaning package tests have to be run when building in linux. So instead ofhostPlatform
there usebuildPlatform
there. This could cause some rebuilds.Add a 👍 reaction to pull requests you find important.