nixosTests: use hostPlatform.system instead of builtins.currentSystem #50028
+2
−3
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 tasks
Ekleog
force-pushed
the
fix-test-system
branch
from
460e333 to
757c372
Compare
Ekleog
changed the title
|
OK so Let's see if ofborg eval passes this time. |
Ekleog
changed the title
Ekleog
force-pushed
the
fix-test-system
branch
from
757c372 to
0bc48db
Compare
|
Looks like a failure for |
| @@ -75,8 +75,7 @@ with pkgs; | |||
|
|
|||
| nixosTests = | |||
| let | |||
| # TODO(Ericson2314,ekleog): Check this will work correctly with cross- | |||
| system = builtins.currentSystem; | |||
| system = hostPlatform.system; | |||
There was a problem hiding this comment.
I think it should be stdenv.hostPlatform.system.
|
Closing this as I'm working on addressing the full tests concerns, which will likely render this PR irrelevant. Thank you for your feedback, will integrate in the upcoming PR! :) |
|
This, and more and better (hopefully) is now at #50233. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
This should (hopefully) fix the invalid use of
builtins.currentSystemin #44439.I have tested on normal non-cross NixOS only, unfortunately. Also, I must say I don't really get the meaning of the
systemargument in tests (thought it was the platform on which the test was supposed to run, and hence should default tobuiltins.currentSystem, but I guess I was wrong), so this is likely not the correct system to pick :/cc @Ericson2314
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)