diff --git a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix b/pkgs/os-specific/linux/tuxedo-drivers/default.nix similarity index 72% rename from pkgs/os-specific/linux/tuxedo-keyboard/default.nix rename to pkgs/os-specific/linux/tuxedo-drivers/default.nix index 13a14747a551..ee0d6575459c 100644 --- a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix +++ b/pkgs/os-specific/linux/tuxedo-drivers/default.nix @@ -1,7 +1,14 @@ -{ lib, stdenv, fetchFromGitLab, kernel, linuxHeaders, pahole }: +{ + lib, + stdenv, + fetchFromGitLab, + kernel, + linuxHeaders, + pahole, +}: stdenv.mkDerivation (finalAttrs: { - pname = "tuxedo-keyboard-${kernel.version}"; + pname = "tuxedo-drivers-${kernel.version}"; version = "4.6.2"; src = fetchFromGitLab { @@ -36,10 +43,12 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.com/tuxedocomputers/development/packages/tuxedo-drivers"; license = lib.licenses.gpl3Plus; longDescription = '' - This driver provides support for Fn keys, brightness/color/mode for most TUXEDO - keyboards (except white backlight-only models). + Drivers for several platform devices for TUXEDO notebooks: + - Driver for Fn-keys + - SysFS control of brightness/color/mode for most TUXEDO keyboards + - Hardware I/O driver for TUXEDO Control Center - Can be used with the "hardware.tuxedo-keyboard" NixOS module. + Can be used with the "hardware.tuxedo-drivers" NixOS module. ''; maintainers = [ lib.maintainers.blanky0230 ]; platforms = lib.platforms.linux; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 3418a7925ca4..94960c9cc01e 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -486,7 +486,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-drivers = if lib.versionAtLeast kernel.version "4.14" then callPackage ../os-specific/linux/tuxedo-drivers { } else null; jool = callPackage ../os-specific/linux/jool { }; @@ -616,6 +616,7 @@ in { kvdo = throw "kvdo was removed, because it was added to mainline in kernel version 6.9"; # Added 2024-07-08 system76-power = lib.warn "kernelPackages.system76-power is now pkgs.system76-power" pkgs.system76-power; # Added 2024-10-16 system76-scheduler = lib.warn "kernelPackages.system76-scheduler is now pkgs.system76-scheduler" pkgs.system76-scheduler; # Added 2024-10-16 + tuxedo-keyboard = self.tuxedo-drivers; # Added 2024-09-28 }); hardenedPackagesFor = kernel: overrides: packagesFor (hardenedKernelFor kernel overrides);