Unverified Commit cb0e7ded authored by Tom Hunze's avatar Tom Hunze
Browse files

linuxPackages.digimend: fix build 

`del_timer_sync` was renamed to `timer_delete_sync` in Linux 6.2 [1].
The `del_timer_sync` compatibility wrapper was removed in Linux 6.15
[2].

Upstream PR: https://github.com/DIGImend/digimend-kernel-drivers/pull/729

[1] https://github.com/torvalds/linux/commit/9b13df3fb64ee95e2397585404e442afee2c7d4f
[2] https://github.com/torvalds/linux/commit/8fa7292fee5c5240402371ea89ab285ec856c916
parent 2a75bb5a

pkgs/os-specific/linux/digimend/default.nix

+7 −0
Original line number Diff line number Diff line
@@ -17,6 +17,13 @@ stdenv.mkDerivation { 
    hash = "sha256-5kJj3SJfzrQ3n9r1YOn5xt0KO9WcEf0YpNMjiZEYMEo=";

  };



  patches = [

    # `del_timer_sync` was renamed to `timer_delete_sync` in Linux 6.2.

    # The `del_timer_sync` compatibility wrapper was removed in Linux 6.15.

    # Upstream PR: https://github.com/DIGImend/digimend-kernel-drivers/pull/729

    ./linux-6.15.patch

  ];



  postPatch = ''

    sed 's/udevadm /true /' -i Makefile

    sed 's/depmod /true /' -i Makefile

pkgs/os-specific/linux/digimend/linux-6.15.patch

0 → 100644
+34 −0
Original line number Diff line number Diff line 
From 011686d1018e18c7c5cf5c2468ac43f275ecec82 Mon Sep 17 00:00:00 2001

From: Dominik Kummer <devel@arkades.org>

Date: Sat, 14 Feb 2026 10:13:46 +0100

Subject: [PATCH] add conditional function definition based on kernel version

 for backwards compability



---

 hid-uclogic-core.c | 6 +++++-

 1 file changed, 5 insertions(+), 1 deletion(-)



diff --git a/hid-uclogic-core.c b/hid-uclogic-core.c

index 72680dd..75e7882 100644

--- a/hid-uclogic-core.c

+++ b/hid-uclogic-core.c

@@ -25,6 +25,10 @@

 #include "compat.h"

 #include <linux/version.h>

 

+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 84)

+#define timer_delete_sync del_timer_sync

+#endif

+

 /**

  * uclogic_inrange_timeout - handle pen in-range state timeout.

  * Emulate input events normally generated when pen goes out of range for

@@ -491,7 +495,7 @@ static void uclogic_remove(struct hid_device *hdev)

 {

 	struct uclogic_drvdata *drvdata = hid_get_drvdata(hdev);

 

-	del_timer_sync(&drvdata->inrange_timer);

+	timer_delete_sync(&drvdata->inrange_timer);

 	hid_hw_stop(hdev);

 	kfree(drvdata->desc_ptr);

 	uclogic_params_cleanup(&drvdata->params);