From 162195d35b12be323d7b7b9dbd85a9a6b966ff1a Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 18 Nov 2024 20:34:51 +0200
Subject: [PATCH 1/2] linuxPackages.ipu6-drivers: fix build on Linux >= 6.12

There's been some header files being moved around, and these paches are
necessary to build on Linux >= 6.12.

Tested compilation with 6.11 and 6.12.
---
 pkgs/os-specific/linux/ipu6-drivers/default.nix | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/ipu6-drivers/default.nix b/pkgs/os-specific/linux/ipu6-drivers/default.nix
index d6aafa53a52f..c6453fcc2a67 100644
--- a/pkgs/os-specific/linux/ipu6-drivers/default.nix
+++ b/pkgs/os-specific/linux/ipu6-drivers/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , ivsc-driver
 , kernel
 }:
@@ -16,7 +17,21 @@ stdenv.mkDerivation rec {
     hash = "sha256-xdMwINoKrdRHCPMpdZQn86ATi1dAXncMU39LLXS16mc=";
   };
 
-  patches = [ "${src}/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch" ];
+  patches = [
+    "${src}/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch"
+
+
+    # Fix compilation with kernels >= 6.12
+    # https://github.com/intel/ipu6-drivers/pull/283
+    (fetchpatch {
+      url = "https://github.com/intel/ipu6-drivers/pull/283/commits/391832777148e8e59ebf08e5d04f87dc8f3cef5b.patch";
+      hash = "sha256-oC7wn4jrHNtvsgouq7F+ufIE02pJcm42ZmgU2TrAvjA=";
+    })
+    (fetchpatch {
+      url = "https://github.com/intel/ipu6-drivers/pull/283/commits/5379758bcb21be56b600817edf989dcc2c1775cf.patch";
+      hash = "sha256-9nOm0ffSNoyVV1y4J6RKBVRVYRxrEPOnggFXGIExLxs=";
+    })
+  ];
 
   postPatch = ''
     cp --no-preserve=mode --recursive --verbose \

From 029a990d27d18274414c202925972b53065af9a7 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 19 Nov 2024 22:40:24 +0200
Subject: [PATCH 2/2] linuxPackages.ipu6-drivers: unstable-2024-10-10 ->
 unstable-2024-11-19

https://github.com/intel/ipu6-drivers/pull/283 got merged, so we just
can update the snapshot we're pointing to.
---
 .../linux/ipu6-drivers/default.nix            | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/pkgs/os-specific/linux/ipu6-drivers/default.nix b/pkgs/os-specific/linux/ipu6-drivers/default.nix
index c6453fcc2a67..117aefc25eca 100644
--- a/pkgs/os-specific/linux/ipu6-drivers/default.nix
+++ b/pkgs/os-specific/linux/ipu6-drivers/default.nix
@@ -1,36 +1,23 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , ivsc-driver
 , kernel
 }:
 
 stdenv.mkDerivation rec {
   pname = "ipu6-drivers";
-  version = "unstable-2024-10-10";
+  version = "unstable-2024-11-19";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "ipu6-drivers";
-    rev = "118952d49ec598f56add50d93fa7bc3ac4a05643";
-    hash = "sha256-xdMwINoKrdRHCPMpdZQn86ATi1dAXncMU39LLXS16mc=";
+    rev = "0ad4988248d7e9382498a0b47fc78bb990b29a58";
+    hash = "sha256-UFvwuoAzwk1k4YiUK+4EeMKeTx9nVvBgBN5JKAfqZkQ=";
   };
 
   patches = [
     "${src}/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch"
-
-
-    # Fix compilation with kernels >= 6.12
-    # https://github.com/intel/ipu6-drivers/pull/283
-    (fetchpatch {
-      url = "https://github.com/intel/ipu6-drivers/pull/283/commits/391832777148e8e59ebf08e5d04f87dc8f3cef5b.patch";
-      hash = "sha256-oC7wn4jrHNtvsgouq7F+ufIE02pJcm42ZmgU2TrAvjA=";
-    })
-    (fetchpatch {
-      url = "https://github.com/intel/ipu6-drivers/pull/283/commits/5379758bcb21be56b600817edf989dcc2c1775cf.patch";
-      hash = "sha256-9nOm0ffSNoyVV1y4J6RKBVRVYRxrEPOnggFXGIExLxs=";
-    })
   ];
 
   postPatch = ''