-
-
Notifications
You must be signed in to change notification settings - Fork 14.7k
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
tuxedo-keyboard: fix compilation for kernel 6.10 and 6.11 #336633
Conversation
Please change the commit message format to fit the guidelines in CONTRIBUTING.md |
Also, it may be worth renaming the package to fit its presumably now extended scope? |
66c5da9
to
19cd864
Compare
I also renamed the related config options to the new scope of the tuxedo driver. I hope this is ok. |
There are already commit in the new upstream repo to fix compile errors with kernel 6.11. Thus, I will most likely provide a follow up pull request the coming days to update this driver to version 4.6.3. |
pkgs/top-level/linux-kernels.nix
Outdated
@@ -488,7 +488,7 @@ in { | |||
|
|||
rust-out-of-tree-module = if lib.versionAtLeast kernel.version "6.7" then callPackage ../os-specific/linux/rust-out-of-tree-module { } else null; | |||
|
|||
tuxedo-keyboard = if lib.versionAtLeast kernel.version "4.14" then callPackage ../os-specific/linux/tuxedo-keyboard { } else null; | |||
tuxedo-driver = if lib.versionAtLeast kernel.version "4.14" then callPackage ../os-specific/linux/tuxedo-driver { } else null; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As you renamed the package here, could you add an alias to block at line 608, in-case someone didn't use the module.
Something like this:
tuxedo-keyboard = self.tuxedo-drivers;
f5a12de
to
a7b81bf
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Still works on my Pulse Gen 1.
Now it also runs with kernel 6.11 on my Aura 15 Gen1. |
c3395c6
to
22dba23
Compare
@blanky0230 What do you think? As you are the maintainer could you review my changes please so it's clear to committers in what state this is? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hate to nitpick catching up with reviews this late but: Since the manufacturer's repo is named "tuxedo-drivers" (plural), I think the corresponding linuxPackage and nixosModule in nixpkgs should share the same name in order to minimize the possibility for mix-ups and user's confusion in the future.
Other than that this PR is looking good to me 👍
@chmanie looks fine so far. You could test if the For the failed temperature reading I am not sure whether this driver or a generic one for the Intel or AMD platform provides this sensor. Try running |
So, I rebased and fixed a merge conflict because someone added some system76 things above of my changes in Is there something else I have to do? How do I get the attention of a committer to merge this? |
The |
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/prs-ready-for-review/3032/4779 |
@K900 can you please check this PR. |
@Keksgesicht I tried what you said (with the new commit): nixpkgs = {
type = "github";
owner = "NixOS";
repo = "nixpkgs";
ref = "master";
rev = "fa957fa9d827c2bf471acdf00c89806cec47926b";
}; Sadly I'm getting the same error:
|
setting it directly to your fork worked though: nixpkgs = {
type = "github";
owner = "Keksgesicht";
repo = "nixpkgs";
ref = "master";
rev = "8972df5e5ace61612feec3d88b8d768b041dc664";
}; |
Co-Authored-By: April John <[email protected]> Co-Authored-By: Dominik Xaver Hörl <[email protected]> thanks to the work of: - NixOS#293017 - NixOS#343483
so now that it's merged to master, how we can use it? Or better when will be in |
The unstable channel just advanced a few hours ago, so it should be there already. |
by the way thanks for merging this @SuperSandro2000 ❤️ |
Description of changes
It seems like the tuxedo-keyboard has moved to GitLab a little time ago. Thus, I changed the source git the new GitLab URL and updated the version number. This also fixes a bug when compiling with Kernel 6.10.
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.