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

xiaomi-tissot: use android-linux-stable, fix USB #213

Merged
merged 2 commits into from Oct 3, 2020

Conversation

@lheckemann
Copy link
Member

@lheckemann lheckemann commented Oct 2, 2020

(based on #212, will rebase again once that's merged, just opening this so I don't forget it again)

@samueldr
Copy link
Member

@samueldr samueldr commented Oct 3, 2020

I believe the only change needed is, once you rebase, to deal with the kernelPatches arg change in the kernel derivation.

Oh, and the full device name in the commit message, always :) (s/^tissot/xiaomi-tissot/).

@lheckemann lheckemann force-pushed the lheckemann:tissot-als branch from 8842e09 to c02c2b8 Oct 3, 2020
@lheckemann
Copy link
Member Author

@lheckemann lheckemann commented Oct 3, 2020

Hm, I'm not sure I understand what you mean by the kernelPatches change. patches seems to work as before?

@samueldr
Copy link
Member

@samueldr samueldr commented Oct 3, 2020

Well, you did it, without realizing it.

The parameter kernelPatches was dropped from xiaomi-tissot/default.nix and xiaomi-tissot/kernel/default.nix. So I guess you didn't have trouble rebasing your changes even though that should have caused conflicts :).

@samueldr
Copy link
Member

@samueldr samueldr commented Oct 3, 2020

Thanks!

@samueldr samueldr merged commit 1b1e08f into NixOS:master Oct 3, 2020
3 checks passed
3 checks passed
Parse_nix
Details
Documentation
Details
Instantiation
Details
@lheckemann lheckemann deleted the lheckemann:tissot-als branch Oct 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.