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

apple: init MacBookPro11,1 #1222

Merged
merged 2 commits into from
Nov 6, 2024
Merged

apple: init MacBookPro11,1 #1222

merged 2 commits into from
Nov 6, 2024

Conversation

j0hax
Copy link
Member

@j0hax j0hax commented Nov 1, 2024

Description of changes

Just a simple module I wrote for my late 2013 MacBook Pro and would like to share with the community.

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


# broadcom-wl
hardware.enableRedistributableFirmware = lib.mkDefault true;
boot.extraModulePackages = with config.boot.kernelPackages; [ broadcom_sta ];
Copy link
Member

Choose a reason for hiding this comment

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

Is this driver not also picked up by nixos-generate-config?

Copy link
Member Author

Choose a reason for hiding this comment

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

@Mic92
Copy link
Member

Mic92 commented Nov 2, 2024

@mergify queue

Copy link
Contributor

mergify bot commented Nov 2, 2024

queue

🛑 The pull request has been removed from the queue default

The pull request #1222 has been manually 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
Copy link
Member

Mic92 commented Nov 2, 2024

@mergify queue

Copy link
Contributor

mergify bot commented Nov 2, 2024

queue

🛑 Branch protection settings are not validated anymore

Branch protection is enabled and is preventing Mergify to merge the pull request. Mergify will merge when branch protection settings validate the pull request once again. (detail: This branch can't be rebased)

@Mic92
Copy link
Member

Mic92 commented Nov 2, 2024

@mergify refresh

Copy link
Contributor

mergify bot commented Nov 2, 2024

refresh

✅ Pull request refreshed

@Mic92
Copy link
Member

Mic92 commented Nov 6, 2024

@mergify rebase

Copy link
Contributor

mergify bot commented Nov 6, 2024

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/2)
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Auto-merging flake.nix
error: could not apply a1e00d1... apple: init MacBookPro11,1
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply a1e00d1... apple: init MacBookPro11,1

@Mic92
Copy link
Member

Mic92 commented Nov 6, 2024

@mergify queue

Copy link
Contributor

mergify bot commented Nov 6, 2024

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at 12ad8c1

@mergify mergify bot merged commit 12ad8c1 into NixOS:master Nov 6, 2024
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