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/t2: deprecate enableTinyDfr option #1231

Merged
merged 1 commit into from
Nov 6, 2024
Merged

apple/t2: deprecate enableTinyDfr option #1231

merged 1 commit into from
Nov 6, 2024

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented Nov 6, 2024

same as in #1225

@Mic92
Copy link
Member Author

Mic92 commented Nov 6, 2024

@mergify queue

Copy link
Contributor

mergify bot commented Nov 6, 2024

queue

🛑 The pull request has been removed from the queue default

The merge conditions cannot be satisfied due to failing checks.

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.

mergify bot added a commit that referenced this pull request Nov 6, 2024
…apple.touchBar`

* Adds a deprecation warning to hardware.apple-t2.enableTinyDfr as it has
  been upstreamed to nixpkgs already. The package and option can be
  removed at the next release cycle to hopefully not break people's setup.

* Adds an assertion to conflict hardware.apple-t2.enableTinyDfr with
  hardware.apple.touchBar. Having both enabled causes both tiny-dfr to
  fight for the same display device.
@Mic92
Copy link
Member Author

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 e1cc1f6

@mergify mergify bot merged commit e1cc1f6 into master Nov 6, 2024
3 checks passed
@mergify mergify bot deleted the apple-t2 branch November 6, 2024 18:59
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