diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
| commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
| tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/development/libraries/spdk | |
| parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
| parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
| download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip | |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/spdk')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/spdk/default.nix | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/spdk/default.nix b/nixpkgs/pkgs/development/libraries/spdk/default.nix index e4884b85b4ae..23464990d869 100644 --- a/nixpkgs/pkgs/development/libraries/spdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/spdk/default.nix @@ -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 |