From e820d20801dec1e207edc4fb438cd83f7a49c103 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 23 Mar 2026 12:57:26 +0100 Subject: [PATCH 1/2] linuxPackages.dpdk-kmods: move env variables into env for structuredAttrs --- pkgs/os-specific/linux/dpdk-kmods/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/dpdk-kmods/default.nix b/pkgs/os-specific/linux/dpdk-kmods/default.nix index 034d0545fc58..592320334753 100644 --- a/pkgs/os-specific/linux/dpdk-kmods/default.nix +++ b/pkgs/os-specific/linux/dpdk-kmods/default.nix @@ -20,14 +20,15 @@ stdenv.mkDerivation rec { makeFlags = kernelModuleMakeFlags ++ [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; - KSRC = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; + + env.KSRC = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; nativeBuildInputs = kernel.moduleBuildDependencies; preBuild = "cd linux/igb_uio"; installPhase = '' - make -C ${KSRC} M=$(pwd) modules_install $makeFlags + make -C ${env.KSRC} M=$(pwd) modules_install $makeFlags ''; enableParallelBuilding = true; From 15b92cdc2ef42a4c1fcf33b05eeb278682827c5c Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 23 Mar 2026 13:15:50 +0100 Subject: [PATCH 2/2] linuxPackages.dpdk-kmods: use finalAttrs, hash instead of sha256 --- pkgs/os-specific/linux/dpdk-kmods/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/dpdk-kmods/default.nix b/pkgs/os-specific/linux/dpdk-kmods/default.nix index 592320334753..e158912d5324 100644 --- a/pkgs/os-specific/linux/dpdk-kmods/default.nix +++ b/pkgs/os-specific/linux/dpdk-kmods/default.nix @@ -6,13 +6,13 @@ kernelModuleMakeFlags, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dpdk-kmods"; version = "2023-02-05"; src = fetchzip { url = "https://git.dpdk.org/dpdk-kmods/snapshot/dpdk-kmods-e721c733cd24206399bebb8f0751b0387c4c1595.tar.xz"; - sha256 = "sha256-AG5Lthp+CPR4R7I23DUmoWAmET8gLEFHHdjk2TUbQn4="; + hash = "sha256-AG5Lthp+CPR4R7I23DUmoWAmET8gLEFHHdjk2TUbQn4="; }; hardeningDisable = [ "pic" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { preBuild = "cd linux/igb_uio"; installPhase = '' - make -C ${env.KSRC} M=$(pwd) modules_install $makeFlags + make -C ${finalAttrs.env.KSRC} M=$(pwd) modules_install $makeFlags ''; enableParallelBuilding = true; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.mic92 ]; platforms = lib.platforms.linux; }; -} +})