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.

Sign up for GitHub

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

Jump to bottom

lib.systems.architectures: add microarchitecture levels #239120

Merged
merged 1 commit into from
Jul 4, 2023
Merged

lib.systems.architectures: add microarchitecture levels #239120

merged 1 commit into from
Jul 4, 2023

Conversation

fabianhjr
Copy link
Member

@fabianhjr fabianhjr commented Jun 22, 2023 •
edited
Loading

Description of changes

Slight variation on #208398 (split from #202526) and #224978

Main differences:

  • Keep generic microarchs apart of specific microarchs and at the beginning
  • Use the spec instead of wikipedia as reference
  • Generic microarch order does not contain specific microarchs (due to spec not including everything those microarchs include those aren't technically a superset)
  • Use of lib.unique to deal with duplicates caused by dependency diamonds / partial order
  • Resolve confilct after lib.systems: add znver4 architecture #238133 got merged
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jun 22, 2023
Shawn8901
Shawn8901 approved these changes Jun 22, 2023
View reviewed changes
Copy link
Contributor

@Shawn8901 Shawn8901 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does sadly result in a full rebuild (as i am using x86-64-v3) but beside that lgtm.

@K900
Copy link
Contributor

K900 commented Jun 22, 2023

LGTM.

RaitoBezarius
RaitoBezarius approved these changes Jun 22, 2023
View reviewed changes
Copy link
Member

@RaitoBezarius RaitoBezarius left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@fabianhjr @SuperSandro2000
@Shawn8901 @averyanalex
lib.systems.architectures: add microarchitecture levels
79dfc50 
Variation on:
- NixOS#208398
- NixOS#224978

Co-authored-by: Sandro Jäckel <[email protected]>
Co-authored-by: Shawn8901 <[email protected]>
Co-authored-by: AveryanAlex <[email protected]>
@fabianhjr fabianhjr changed the title lib/systems/architectures: add microarchitecture levels lib.systems.architectures: add microarchitecture levels Jun 24, 2023
@fabianhjr fabianhjr added 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approvals: 3+ This PR was reviewed and approved by three or more reputable people and removed 12.approvals: 2 This PR was reviewed and approved by two reputable people labels Jun 24, 2023
@mweinelt mweinelt removed the 12.approvals: 3+ This PR was reviewed and approved by three or more reputable people label Jun 25, 2023
@RaitoBezarius RaitoBezarius requested a review from a user June 26, 2023 09:22
@Artturin Artturin merged commit 359e113 into NixOS:master Jul 4, 2023
@fabianhjr fabianhjr deleted the arch-stuff branch July 4, 2023 22:41
@SuperSamus
Copy link
Contributor

Is #208398 still meant to be open?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Shawn8901 Shawn8901 Shawn8901 approved these changes

@thiagokokada thiagokokada thiagokokada approved these changes

@RaitoBezarius RaitoBezarius RaitoBezarius approved these changes

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@alyssais alyssais Awaiting requested review from alyssais

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

@K900 K900 Awaiting requested review from K900

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@fabianhjr @K900 @SuperSamus @RaitoBezarius @thiagokokada @Shawn8901 @mweinelt @Artturin