spdk: 20.04.1 -> 21.04

+5 -18
+5 -18
pkgs/development/libraries/spdk/default.nix
··· 13 13 , openssl 14 14 }: 15 15 16 - let 17 - dpdk-compat-patch = fetchurl { 18 - url = "https://review.spdk.io/gerrit/plugins/gitiles/spdk/spdk/+/6acb9a58755856fb9316baf9dbbb7239dc6b9446%5E%21/?format=TEXT"; 19 - sha256 = "18q0956fkjw19r29hp16x4pygkfv01alj9cld2wlqqyfgp41nhn0"; 20 - }; 21 - in stdenv.mkDerivation rec { 16 + stdenv.mkDerivation rec { 22 17 pname = "spdk"; 23 - version = "20.04.1"; 18 + version = "21.04"; 24 19 25 20 src = fetchFromGitHub { 26 21 owner = "spdk"; 27 22 repo = "spdk"; 28 23 rev = "v${version}"; 29 - sha256 = "ApMyGamPrMalzZLbVkJlcwatiB8dOJmoxesdjkWZElk="; 24 + sha256 = "sha256-Xmmgojgtt1HwTqG/1ZOJVo1BcdAH0sheu40d73OJ68w="; 30 25 }; 31 26 32 - patches = [ 33 - ./spdk-dpdk-meson.patch 34 - # https://review.spdk.io/gerrit/c/spdk/spdk/+/3134 35 - (fetchpatch { 36 - url = "https://github.com/spdk/spdk/commit/c954b5b722c5c163774d3598458ff726c48852ab.patch"; 37 - sha256 = "1n149hva5qxmpr0nmav10nya7zklafxi136f809clv8pag84g698"; 38 - }) 39 - ]; 40 - 41 27 nativeBuildInputs = [ 42 28 python3 43 29 ]; ··· 48 34 49 35 postPatch = '' 50 36 patchShebangs . 51 - base64 -d ${dpdk-compat-patch} | patch -p1 52 37 ''; 53 38 54 39 configureFlags = [ "--with-dpdk=${dpdk}" ]; 55 40 56 41 NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile. 42 + # otherwise does not find strncpy when compiling 43 + NIX_LDFLAGS = "-lbsd"; 57 44 58 45 enableParallelBuilding = true; 59 46