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

Add Thinkpad X13 Gen1 AMD variant #880

Merged
merged 1 commit into from
Mar 25, 2024
Merged

Add Thinkpad X13 Gen1 AMD variant #880

merged 1 commit into from
Mar 25, 2024

Conversation

jalseth
Copy link
Contributor

@jalseth jalseth commented Mar 3, 2024

Description of changes

Add Thinkpad X13 Gen1 variant for AMD CPU, which is the model I own. https://ubuntu.com/certified/202006-27979/20.04%20LTS.

This change moves some of the config files for the Intel variant, but leaves the Flake output lenovo-thinkpad-x13 as-is to avoid breakage.

Things done
  • Tested the changes in your own NixOS Configuration
  • Tested the changes end-to-end by using your fork of nixos-hardware and
    importing it via <nixos-hardware> or Flake input

@@ -0,0 +1,6 @@
{ ... }: {
imports = [
../.
Copy link
Member

Choose a reason for hiding this comment

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

Will this not also include the intel module?

Copy link
Member

Choose a reason for hiding this comment

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

The old module could be by using assertions:

message = "Importing framework/ (default.nix) directly is deprecated! See https://github.com/NixOS/nixos-hardware/blob/master/framework/OLD-BEHAVIOUR-DEPRECATION.md for more details.";

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't think so? The imports = [ ../../../common/cpu/intel ] line was deleted from ../default.nix.

Thanks for the tip, I've added an assertion to help clarify this for future users.

@Mic92
Copy link
Member

Mic92 commented Mar 25, 2024

@mergify queue

Copy link
Contributor

mergify bot commented Mar 25, 2024

queue

🛑 The pull request has been removed from the queue default

The pull request can't be updated.

You can take a look at Queue: Embarked in merge queue check runs for more details.

In case of a failure due to a flaky test, you should first retrigger the CI.
Then, re-embark the pull request into the merge queue by posting the comment
@mergifyio refresh on the pull request.

@Mic92 Mic92 merged commit 9a763a7 into NixOS:master Mar 25, 2024
2 of 3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants