Skip to content
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

Fix attribute 'selectBySystem' missing #257

Merged
merged 1 commit into from Dec 25, 2020
Merged

Conversation

fx-chun
Copy link
Member

@fx-chun fx-chun commented Dec 24, 2020

Closes #252.

@fx-chun fx-chun changed the title Fix attribute 'selectBySystem' missing [WIP] Fix attribute 'selectBySystem' missing Dec 24, 2020
@fx-chun fx-chun changed the title [WIP] Fix attribute 'selectBySystem' missing Fix attribute 'selectBySystem' missing Dec 24, 2020
@samueldr
Copy link
Member

@noneucat I have pushed a simplified version. Tell me if you see anything wrong, I'll end-up merging this soon (1-3 days) anyway. Earlier if you confirm there are no issues.

Closes NixOS#252.

This uses the `lib.systems.elaborate` function which builds the
complete attrset as preferred by Nixpkgs by using
`lib.systems.elaborate`, rather than building a partial equivalent.

@noneucat originally implemented it the simplest way possible, re-using
parts of the now unneeded custom functions. We can, instead, simply
pass a system name to `elaborate`, which ends up doing the right thing.

Co-authored-by: Andy Chun <andy@lolc.at>
Co-authored-by: Samuel Dionne-Riel <samuel@dionne-riel.com>
@samueldr
Copy link
Member

Oh, and thank you for tracking down that elaborate function. It's much much much better than fiddling with an attrset!

@samueldr samueldr added 4. type: regression Something stopped working 4. type: cleanup labels Dec 24, 2020
@fx-chun
Copy link
Member Author

fx-chun commented Dec 24, 2020

lgtm! No problem! @samueldr

@samueldr samueldr merged commit 194384c into NixOS:master Dec 25, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

error: attribute 'selectBySystem' missing
2 participants