From 66aa8b29308b096315daa71cdacb12f05cd66d14 Mon Sep 17 00:00:00 2001 From: Martin Woods Date: Mon, 8 Sep 2025 09:04:49 +0200 Subject: [PATCH 1/3] linuxPackages.tuxedo-drivers: 4.14.0 -> 4.15.4 --- pkgs/os-specific/linux/tuxedo-drivers/default.nix | 6 ++++-- .../linux/tuxedo-drivers/no-cp-etc-usr.patch | 12 ++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 pkgs/os-specific/linux/tuxedo-drivers/no-cp-etc-usr.patch diff --git a/pkgs/os-specific/linux/tuxedo-drivers/default.nix b/pkgs/os-specific/linux/tuxedo-drivers/default.nix index 7386e0b8ddf1..deb5828b7c80 100644 --- a/pkgs/os-specific/linux/tuxedo-drivers/default.nix +++ b/pkgs/os-specific/linux/tuxedo-drivers/default.nix @@ -11,16 +11,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "tuxedo-drivers-${kernel.version}"; - version = "4.14.0"; + version = "4.15.4"; src = fetchFromGitLab { group = "tuxedocomputers"; owner = "development/packages"; repo = "tuxedo-drivers"; rev = "v${finalAttrs.version}"; - hash = "sha256-79YZaK8WrHOxSUJWxi4lc+foh4xz3EgRnjw+OrL8yqU="; + hash = "sha256-WJeju+czbCw03ALW7yzGAFENCEAvDdKqHvedchd7NVY="; }; + patches = [ ./no-cp-etc-usr.patch ]; + buildInputs = [ pahole ]; nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/tuxedo-drivers/no-cp-etc-usr.patch b/pkgs/os-specific/linux/tuxedo-drivers/no-cp-etc-usr.patch new file mode 100644 index 000000000000..9e94a43d60c5 --- /dev/null +++ b/pkgs/os-specific/linux/tuxedo-drivers/no-cp-etc-usr.patch @@ -0,0 +1,12 @@ +diff --git a/Makefile b/Makefile +index 75a6bc1..6021d42 100644 +--- a/Makefile ++++ b/Makefile +@@ -30,7 +30,6 @@ all: + + install: all + make -C $(KDIR) M=$(PWD) $(MAKEFLAGS) modules_install +- cp -r etc usr / + + clean: + make -C $(KDIR) M=$(PWD) $(MAKEFLAGS) clean From 21d59c1293e23dfd204661e52bd514b40e820014 Mon Sep 17 00:00:00 2001 From: Martin Woods Date: Wed, 10 Sep 2025 11:52:51 +0200 Subject: [PATCH 2/3] linuxPackages.tuxedo-drivers: added copy of udev rules --- pkgs/os-specific/linux/tuxedo-drivers/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/tuxedo-drivers/default.nix b/pkgs/os-specific/linux/tuxedo-drivers/default.nix index deb5828b7c80..7220145adb61 100644 --- a/pkgs/os-specific/linux/tuxedo-drivers/default.nix +++ b/pkgs/os-specific/linux/tuxedo-drivers/default.nix @@ -23,6 +23,11 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./no-cp-etc-usr.patch ]; + postInstall = '' + echo "Running postInstallhook" + install -Dm 0644 -t $out/etc/udev/rules.d usr/lib/udev/rules.d/* + ''; + buildInputs = [ pahole ]; nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; From 00f22eb94840e3ff0ad5b3ba3a5729ff72c90dfe Mon Sep 17 00:00:00 2001 From: r-vdp Date: Sat, 13 Sep 2025 10:27:11 +0200 Subject: [PATCH 3/3] linuxPackages.tuxedo-drivers: enable udevCheckHook --- pkgs/os-specific/linux/tuxedo-drivers/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/tuxedo-drivers/default.nix b/pkgs/os-specific/linux/tuxedo-drivers/default.nix index 7220145adb61..a9f579fb6154 100644 --- a/pkgs/os-specific/linux/tuxedo-drivers/default.nix +++ b/pkgs/os-specific/linux/tuxedo-drivers/default.nix @@ -7,6 +7,7 @@ kmod, pahole, gitUpdater, + udevCheckHook, }: stdenv.mkDerivation (finalAttrs: { @@ -29,7 +30,11 @@ stdenv.mkDerivation (finalAttrs: { ''; buildInputs = [ pahole ]; - nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; + nativeBuildInputs = [ + kmod + udevCheckHook + ] + ++ kernel.moduleBuildDependencies; makeFlags = kernelModuleMakeFlags ++ [ "KERNELRELEASE=${kernel.modDirVersion}" @@ -37,6 +42,8 @@ stdenv.mkDerivation (finalAttrs: { "INSTALL_MOD_PATH=${placeholder "out"}" ]; + doInstallCheck = true; + passthru.updateScript = gitUpdater { rev-prefix = "v"; };