diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/spdk/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/spdk/default.nix | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/spdk/default.nix b/nixpkgs/pkgs/development/libraries/spdk/default.nix index ec20f68b6f48..e4884b85b4ae 100644 --- a/nixpkgs/pkgs/development/libraries/spdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/spdk/default.nix @@ -1,7 +1,6 @@ { lib, stdenv -, fetchurl -, fetchFromGitHub , fetchpatch +, fetchFromGitHub , ncurses , python3 , cunit @@ -15,15 +14,27 @@ stdenv.mkDerivation rec { pname = "spdk"; - version = "21.07"; + version = "21.10"; src = fetchFromGitHub { owner = "spdk"; repo = "spdk"; rev = "v${version}"; - sha256 = "sha256-/hynuYVdzIfiHUUfuuOY8SBJ18DqJr2Fos2JjQQVvbg="; + sha256 = "sha256-pFynTbbSF1g58VD9bOhe3c4oCozeqE+35kECTQwDBDM="; }; + patches = [ + # Backport of upstream patch for ncurses-6.3 support. + # Will be in next release after 21.10. + ./ncurses-6.3.patch + + # DPDK 21.11 compatibility. + (fetchpatch { + url = "https://github.com/spdk/spdk/commit/f72cab94dd35d7b45ec5a4f35967adf3184ca616.patch"; + sha256 = "sha256-sSetvyNjlM/hSOUsUO3/dmPzAliVcteNDvy34yM5d4A="; + }) + ]; + nativeBuildInputs = [ python3 ]; @@ -36,6 +47,8 @@ stdenv.mkDerivation rec { patchShebangs . ''; + enableParallelBuilding = true; + configureFlags = [ "--with-dpdk=${dpdk}" ]; NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile. |