about summary refs log tree commit diff
path: root/pkgs/os-specific/linux/dpdk-kmods
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2022-10-31 13:40:48 +0100
committerJörg Thalheim <joerg@thalheim.io>2022-10-31 13:41:56 +0100
commit1a15be699b935816762e98d8346c2769fa26708f (patch)
treed7ee75397c8e8ce291d22544218e64a0861f6ff0 /pkgs/os-specific/linux/dpdk-kmods
parent9d220f506756cf405d6ceda3706ff068a479954f (diff)
dpdk-kmods: fix build against 5.18
Diffstat (limited to 'pkgs/os-specific/linux/dpdk-kmods')
-rw-r--r--pkgs/os-specific/linux/dpdk-kmods/default.nix16
1 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/dpdk-kmods/default.nix b/pkgs/os-specific/linux/dpdk-kmods/default.nix
index cdd643a40b661..a3e4f6663860a 100644
--- a/pkgs/os-specific/linux/dpdk-kmods/default.nix
+++ b/pkgs/os-specific/linux/dpdk-kmods/default.nix
@@ -1,14 +1,21 @@
-{ lib, stdenv, fetchzip, kernel }:
+{ lib, stdenv, fetchzip, fetchpatch, kernel }:
 
 stdenv.mkDerivation rec {
   pname = "dpdk-kmods";
-  version = "2021-04-21";
+  version = "2022-08-29";
 
   src = fetchzip {
-    url = "https://git.dpdk.org/dpdk-kmods/snapshot/dpdk-kmods-e13d7af77a1bf98757f85c3c4083f6ee6d0d2372.tar.xz";
-    sha256 = "sha256-8ysWT3X3rIyUAo4/QbkX7cQq5iFeU18/BPsmmWugcIc=";
+    url = "https://git.dpdk.org/dpdk-kmods/snapshot/dpdk-kmods-4a589f7bed00fc7009c93d430bd214ac7ad2bb6b.tar.xz";
+    sha256 = "sha256-l9asJuw2nl63I1BxK6udy2pNunRiMJxyoXeg9V5+WgI=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://git.launchpad.net/ubuntu/+source/dpdk-kmods/plain/debian/patches/0001-support-linux-5.18.patch?id=9d628c02c169d8190bc2cb6afd81e4d364c382cd";
+      sha256 = "sha256-j4kpx1DOnmf5lFxOhaVFNT7prEy1jrJERX2NFaybTPU=";
+    })
+  ];
+
   hardeningDisable = [ "pic" ];
 
   makeFlags = kernel.makeFlags ++ [
@@ -32,6 +39,5 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Only;
     maintainers = [ maintainers.mic92 ];
     platforms = platforms.linux;
-    broken = kernel.kernelAtLeast "5.18";
   };
 }