release.nix: fix eval with aarch64-, but not x86_64-darwin supported#154506
Merged
vcunat merged 1 commit intoNixOS:masterfrom Jan 17, 2022
Merged
release.nix: fix eval with aarch64-, but not x86_64-darwin supported#154506vcunat merged 1 commit intoNixOS:masterfrom
vcunat merged 1 commit intoNixOS:masterfrom
Conversation
We emit a few jobs conditionally on supportDarwin which only checked for x86_64-darwin in the past. This change makes it more modular by transforming it into an attribute set which holds the two darwin arches. Jobs needing aarch64-darwin or x86_64-darwin are now only emitted if their respective platform is actually in supportedSystems. This issue was discovered because the staging-next-21.11 jobset had commented out x86_64-darwin (presumably due to a build load issue).
ofborg
bot
added
6.topic: darwin
toonn
reviewed
Jan 11, 2022
Contributor
toonn
left a comment
toonn
left a comment
There was a problem hiding this comment.
Not familiar with release.nix but this LGTM.
It's intentional for there not to be an aarch64 counterpart for things like darwin-tested right?
Member
Author
I think it wasn't properly considered how evaluating |
1 task
Contributor
|
Successfully created backport PR #155370 for |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
We emit a few jobs conditionally on supportDarwin which only checked for
x86_64-darwin in the past. This change makes it more modular by
transforming it into an attribute set which holds the two darwin
arches. Jobs needing aarch64-darwin or x86_64-darwin are now only
emitted if their respective platform is actually in supportedSystems.
This issue was discovered because the staging-next-21.11 jobset had
commented out x86_64-darwin (presumably due to a build load issue).
Motivation for this change
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes