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

Merge pull request #171648 from mweinelt/dpdk

Browse Source 
dpdk: 21.11 -> 22.03
This commit is contained in:
Jörg Thalheim 2022-05-14 07:14:27 +01:00 committed by GitHub
commit cdfdabd2bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/libraries/spdk/default.nix
View File

@ -10,9 +10,19 @@
, libuuid
, numactl
, openssl
, fetchurl
}:
stdenv.mkDerivation rec {
let
# The old version has some CVEs howver they should not affect SPDK's usage of the framework: https://github.com/NixOS/nixpkgs/pull/171648#issuecomment-1121964568
dpdk' = dpdk.overrideAttrs (old: rec {
name = "dpdk-21.11";
src = fetchurl {
url = "https://fast.dpdk.org/rel/${name}.tar.xz";
sha256 = "sha256-Mkbj7WjuKzaaXYviwGzxCKZp4Vf01Bxby7sha/Wr06E=";
};
});
in stdenv.mkDerivation rec {
pname = "spdk";
version = "21.10";
@ -40,7 +50,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
cunit dpdk libaio libbsd libuuid numactl openssl ncurses
cunit dpdk' libaio libbsd libuuid numactl openssl ncurses
];
postPatch = ''
@ -49,7 +59,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
configureFlags = [ "--with-dpdk=${dpdk}" ];
configureFlags = [ "--with-dpdk=${dpdk'}" ];
NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile.
# otherwise does not find strncpy when compiling

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

@ -9,14 +9,14 @@
let
mod = kernel != null;
dpdkVersion = "21.11";
dpdkVersion = "22.03";
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-Mkbj7WjuKzaaXYviwGzxCKZp4Vf01Bxby7sha/Wr06E=";
sha256 = "sha256-st5fCLzVcz+Q1NfmwDJRWQja2PyNJnrGolNELZuDp8U=";
};
nativeBuildInputs = [