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