From 84b9c18a470ae731895fda251d6c8544cf731333 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Wed, 30 Jun 2021 23:21:22 +0800 Subject: [PATCH 1/3] linuxPackages.tuxedo-keyboard: 3.0.5 -> 3.0.7 (cherry picked from commit c7ec86b6894f7c216f4a381ebade4d717069a955) --- pkgs/os-specific/linux/tuxedo-keyboard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix index fabfebfcba1..139bc1d407d 100644 --- a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix +++ b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, kernel, linuxHeaders}: +{ lib, stdenv, fetchFromGitHub, kernel, linuxHeaders }: stdenv.mkDerivation rec { pname = "tuxedo-keyboard-${kernel.version}"; - version = "3.0.5"; + version = "3.0.7"; src = fetchFromGitHub { owner = "tuxedocomputers"; repo = "tuxedo-keyboard"; rev = "v${version}"; - sha256 = "123ady2bi2dwbajy3pgv10l3g2pyhi5k31c1ii0zcrvl2qqhndck"; + sha256 = "sha256-JloLwfJfDdVowx1hOehjxPbnaKBCAMn7SZe09SE03HU="; }; buildInputs = [ linuxHeaders ]; From e17d7f323b0b066990080efb5e703f7fb94bd3ee Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Fri, 6 Aug 2021 21:22:13 +0300 Subject: [PATCH 2/3] linuxPackages.tuxedo-keyboard: 3.0.7 -> 3.0.8 (cherry picked from commit f7286acdae6382fc868c7764943ac9b1c4799090) --- pkgs/os-specific/linux/tuxedo-keyboard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix index 139bc1d407d..75111575a6c 100644 --- a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix +++ b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tuxedo-keyboard-${kernel.version}"; - version = "3.0.7"; + version = "3.0.8"; src = fetchFromGitHub { owner = "tuxedocomputers"; repo = "tuxedo-keyboard"; rev = "v${version}"; - sha256 = "sha256-JloLwfJfDdVowx1hOehjxPbnaKBCAMn7SZe09SE03HU="; + sha256 = "1rv3ns4n61v18cpnp36zi47jpnqhj410yzi8b307ghiyriapbijv"; }; buildInputs = [ linuxHeaders ]; From 52269b659ed88e502fd159d2188b173103babdc8 Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Fri, 6 Aug 2021 21:27:29 +0300 Subject: [PATCH 3/3] linuxPackages.tuxedo-keyboard: expose all kernel modules This commit exposes in addition to the tuxedo-keyboard module: - clevo_acpi - clevo_wmi - tuxedo_io These modules are required to run the Tuxedo Control Center. (cherry picked from commit 2e6d563067c620d42c9d63911a637793698273eb) --- pkgs/os-specific/linux/tuxedo-keyboard/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix index 75111575a6c..01592bb04b7 100644 --- a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix +++ b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix @@ -17,7 +17,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out/lib/modules/${kernel.modDirVersion}" - mv src/tuxedo_keyboard.ko $out/lib/modules/${kernel.modDirVersion} + + for module in clevo_acpi.ko clevo_wmi.ko tuxedo_keyboard.ko tuxedo_io/tuxedo_io.ko; do + mv src/$module $out/lib/modules/${kernel.modDirVersion} + done ''; meta = with lib; {