From e09f075b080bbf96d3d411a19ca7ef5896afe953 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Mon, 23 Dec 2024 10:09:24 -0500
Subject: [PATCH] linuxPackages.xpadneo: 0.9.6 -> 0.9.7

---
 pkgs/os-specific/linux/xpadneo/default.nix    |  8 +++-----
 .../xpadneo/xpadneo-0.9.6-kernel-6.12.patch   | 20 -------------------
 2 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/xpadneo/xpadneo-0.9.6-kernel-6.12.patch

diff --git a/pkgs/os-specific/linux/xpadneo/default.nix b/pkgs/os-specific/linux/xpadneo/default.nix
index f0e5f443c972..39ce3e1c71a3 100644
--- a/pkgs/os-specific/linux/xpadneo/default.nix
+++ b/pkgs/os-specific/linux/xpadneo/default.nix
@@ -10,21 +10,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xpadneo";
-  version = "0.9.6";
+  version = "0.9.7";
 
   src = fetchFromGitHub {
     owner = "atar-axis";
     repo = "xpadneo";
-    rev = "refs/tags/v${finalAttrs.version}";
-    sha256 = "sha256-pX9zpAGnhDLKUAKOQ5iqtK8cKEkjCqDa5v3MwYViWX4=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-evmjQrQPHe8F+6w12bnUv6P4QKGkm63cmP1HEv6equw=";
   };
 
   setSourceRoot = ''
     export sourceRoot=$(pwd)/${finalAttrs.src.name}/hid-xpadneo/src
   '';
 
-  patches = [ ./xpadneo-0.9.6-kernel-6.12.patch ];
-
   nativeBuildInputs = kernel.moduleBuildDependencies;
   buildInputs = [ bluez ];
 
diff --git a/pkgs/os-specific/linux/xpadneo/xpadneo-0.9.6-kernel-6.12.patch b/pkgs/os-specific/linux/xpadneo/xpadneo-0.9.6-kernel-6.12.patch
deleted file mode 100644
index 3e0c8c605db9..000000000000
--- a/pkgs/os-specific/linux/xpadneo/xpadneo-0.9.6-kernel-6.12.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/hid-xpadneo.c
-+++ b/hid-xpadneo.c
-@@ -713,5 +713,9 @@
- }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,12,0)
- static u8 *xpadneo_report_fixup(struct hid_device *hdev, u8 *rdesc, unsigned int *rsize)
-+#else
-+static const u8 *xpadneo_report_fixup(struct hid_device *hdev, u8 *rdesc, unsigned int *rsize)
-+#endif
- {
- 	struct xpadneo_devdata *xdata = hid_get_drvdata(hdev);
---- a/xpadneo.h
-+++ b/xpadneo.h
-@@ -13,4 +13,5 @@
- 
- #include <linux/hid.h>
-+#include <linux/version.h>
- 
- #include "hid-ids.h"