From ba20cfea25902894fb414f3e8dcdea8a3b5ad3a2 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 22 Apr 2025 04:23:24 +0800
Subject: [PATCH] dpdk: 24.07 -> 25.03

---
 pkgs/by-name/dp/dpdk/package.nix | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/dp/dpdk/package.nix b/pkgs/by-name/dp/dpdk/package.nix
index 442095436484..02263802f709 100644
--- a/pkgs/by-name/dp/dpdk/package.nix
+++ b/pkgs/by-name/dp/dpdk/package.nix
@@ -1,6 +1,6 @@
 {
-  stdenv,
   lib,
+  stdenv,
   fetchurl,
   pkg-config,
   meson,
@@ -18,7 +18,6 @@
   doxygen,
   python3,
   pciutils,
-  fetchpatch,
   withExamples ? [ ],
   shared ? false,
   machine ? (
@@ -31,13 +30,13 @@
   ),
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "dpdk";
-  version = "24.07";
+  version = "25.03";
 
   src = fetchurl {
-    url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz";
-    sha256 = "sha256-mUT35fJo56ybQZPizVTvbZj24dfd3JZ8d65PZhbW+70=";
+    url = "https://fast.dpdk.org/rel/dpdk-${finalAttrs.version}.tar.xz";
+    hash = "sha256-akCnMTKChuvXloWxj/pZkua3cME4Q9Zf0NEVfPzP9j0=";
   };
 
   nativeBuildInputs = [
@@ -50,6 +49,7 @@ stdenv.mkDerivation rec {
     python3.pkgs.sphinx
     python3.pkgs.pyelftools
   ];
+
   buildInputs = [
     jansson
     libbpf
@@ -69,14 +69,6 @@ stdenv.mkDerivation rec {
     libbsd
   ];
 
-  patches = [
-    (fetchpatch {
-      name = "CVE-2024-11614.patch";
-      url = "https://git.dpdk.org/dpdk-stable/patch/?id=fdf13ea6fede07538fbe5e2a46fa6d4b2368fa81";
-      hash = "sha256-lD2mhPm5r1tWZb4IpzHa2SeK1DyQ3rwjzArRTpAgZAY=";
-    })
-  ];
-
   postPatch = ''
     patchShebangs config/arm buildtools
   '';
@@ -110,20 +102,20 @@ stdenv.mkDerivation rec {
     "doc"
   ] ++ lib.optional (withExamples != [ ]) "examples";
 
-  meta = with lib; {
+  meta = {
     description = "Set of libraries and drivers for fast packet processing";
     homepage = "http://dpdk.org/";
-    license = with licenses; [
+    license = with lib.licenses; [
       lgpl21
       gpl2Only
       bsd2
     ];
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
       magenbluten
       orivej
       mic92
       zhaofengli
     ];
   };
-}
+})