nixos/release.nix: Refactoring for better multi-system support #33749
Conversation
nixos/release.nix
Outdated
| @@ -13,6 +13,8 @@ let | |||
|
|
|||
| forAllSystems = genAttrs supportedSystems; | |||
|
|
|||
| forSubsetOfSystems = systems: genAttrs (intersectLists supportedSystems systems); | |||
There was a problem hiding this comment.
Should this go in release-lib.nix?
There was a problem hiding this comment.
Uff... There's apparently already an equivalent called forAllSupportedSystems in release-lib.nix, but nixos/release.nix is not importing release-lib.nix
There was a problem hiding this comment.
I'd a) import it, b) move forAllSystems to release-lib c) use forAllSupportedSystems.
There was a problem hiding this comment.
Yeah that seems the best (and forAllSystems could be implemented in terms of forAllSupportedSystems to reduce duplication).
I hate the name forAllSupportedSystems though... given that we have forAllSystems which does something for every system passed in supportedSystems... and then forAllSupportedSystems which does something else.
There was a problem hiding this comment.
I have no problem with you renaming them. Maybe something like forAllSystems and forTheseSystems?
I'm going to move forAllSystems from nixos/release.nix, and these functions sound too similar while doing different things.
There's already a similar forTheseSystems in release-lib, so be more consistent.
Currently, even if you pass `supportedSystems = [ "aarch64-linux" ]` you end up with e.g. `nixos.iso_graphical.x86_64-linux` job. Using forTheseSystems from release-lib avoids that. This shouldn't affect the usual x86 trunk-combined jobset.
dezgeg
force-pushed
the
release-refactor-1
branch
from
cdf3d7b
to
4ccf308
Compare
|
Implemented the above suggestions. |
|
Glad you liked them, and thanks for making them! |
Currently, even if you pass
supportedSystems = [ "aarch64-linux" ]youend up with e.g.
nixos.iso_graphical.x86_64-linuxjob. Using the newforSubsetOfSystems avoids that.
This shouldn't affect the usual x86 trunk-combined jobset.
https://hydra.nixos.org/eval/1425558#tabs-removed for the effect on an aarch64-only jobset.