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? |
Keksgesicht
force-pushed
the
master
branch
2 times, most recently
from
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. |
Keksgesicht
changed the title
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.
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;
Keksgesicht
force-pushed
the
master
branch
2 times, most recently
from
f5a12de
to
a7b81bf
Compare
|
Now it also runs with kernel 6.11 on my Aura 15 Gen1. |
Keksgesicht
changed the title
|
@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? |
Not sure, why I kept ingoring the "s". I pushed an updated version. |
|
|
||
| Can be used with the "hardware.tuxedo-drivers" NixOS module. | ||
| ''; | ||
| maintainers = [ lib.maintainers.blanky0230 ]; |
There was a problem hiding this comment.
@Keksgesicht @CutestNekoAqua If you like, join yourselves in as maintainers. Certainly better to have a bus-factor > 1 for this package I suppose.
(I'll soon have a suitable device again too).
There was a problem hiding this comment.
@Keksgesicht As per #343483 ->
Also getting @xaverdh into the loop. So they know we're trying to tighten up all the various loose ends.
There was a problem hiding this comment.
I am not sure, whether I should add other people. But as they clearly want to develop this further, I could add them in the commit too.
The most important differences to my PR are the build commands for the kernel module and this is an area I have not enough knowledge. Thus, I would leave my PR in the current state and leave any further changes to @CutestNekoAqua. |
|
@CutestNekoAqua Please have a look when you have some time to spare. Also in regards to setting the list of maintainers: Your call. Didn't mean to exclude you from the decision at: #336633 (comment) |
Sure! |
Keksgesicht
force-pushed
the
master
branch
2 times, most recently
from
25c7290
to
1c08297
Compare
|
@NixOS/nixpkgs-merge-bot merge |
|
@blanky0230 merge not permitted (#305350): |
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
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 = relaxedsandbox = truenix-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.