colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #195100 from Mic92/dpdk

Browse Source 
dpdk: 22.03 -> 22.07
This commit is contained in:
Jörg Thalheim 2022-10-31 14:21:53 +01:00 committed by GitHub
commit cde71397d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/os-specific/linux/dpdk-kmods/default.nix
View File

@ -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";
};
}

6
pkgs/os-specific/linux/dpdk/default.nix
View File

@ -9,14 +9,14 @@
let
mod = kernel != null;
dpdkVersion = "22.03";
dpdkVersion = "22.07";
in stdenv.mkDerivation rec {
pname = "dpdk";
version = "${dpdkVersion}" + lib.optionalString mod "-${kernel.version}";
src = fetchurl {
url = "https://fast.dpdk.org/rel/dpdk-${dpdkVersion}.tar.xz";
sha256 = "sha256-st5fCLzVcz+Q1NfmwDJRWQja2PyNJnrGolNELZuDp8U=";
sha256 = "sha256-n2Tf3gdf21cIy2Leg4uP+4kVdf7R4dKusma6yj38m+o=";
};
nativeBuildInputs = [
@ -91,6 +91,6 @@ in stdenv.mkDerivation rec {
license = with licenses; [ lgpl21 gpl2 bsd2 ];
platforms = platforms.linux;
maintainers = with maintainers; [ magenbluten orivej mic92 zhaofengli ];
broken = mod && kernel.kernelAtLeast "5.18";
broken = mod && kernel.isHardened;
};
}