Merge #222033: xdp-tools: 1.2.9 -> 1.3.1

+12 -2
+12 -2
pkgs/tools/networking/xdp-tools/default.nix
··· 6 , elfutils 7 , zlib 8 , libpcap 9 , llvmPackages 10 , pkg-config 11 , m4 ··· 15 }: 16 stdenv.mkDerivation rec { 17 pname = "xdp-tools"; 18 - version = "1.2.9"; 19 20 src = fetchFromGitHub { 21 owner = "xdp-project"; 22 repo = "xdp-tools"; 23 rev = "v${version}"; 24 - sha256 = "Q1vaogcAeNjLIPaB0ovOo96hzRv69tMO5xwHh5W4Ws0="; 25 }; 26 27 outputs = [ "out" "lib" ]; 28 29 buildInputs = [ ··· 37 emacs-nox # to generate man pages from .org 38 ]; 39 nativeBuildInputs = [ 40 llvmPackages.clang 41 llvmPackages.llvm 42 pkg-config
··· 6 , elfutils 7 , zlib 8 , libpcap 9 + , bpftools 10 , llvmPackages 11 , pkg-config 12 , m4 ··· 16 }: 17 stdenv.mkDerivation rec { 18 pname = "xdp-tools"; 19 + version = "1.3.1"; 20 21 src = fetchFromGitHub { 22 owner = "xdp-project"; 23 repo = "xdp-tools"; 24 rev = "v${version}"; 25 + sha256 = "ctggXzc3qA+m2/nJ9lmR/pERj0YyPko3MTttm8e85cU="; 26 }; 27 28 + patches = [ 29 + # Fix function detection for btf__type_cnt() 30 + (fetchpatch { 31 + url = "https://github.com/xdp-project/xdp-tools/commit/a7df567634af77381832a2212c5f5099b07734f3.patch"; 32 + sha256 = "1i4s4y0z9pf3dnjzxy8k0jkjshhz3b0v49qw4cspjrjlmcmy0x00"; 33 + }) 34 + ]; 35 + 36 outputs = [ "out" "lib" ]; 37 38 buildInputs = [ ··· 46 emacs-nox # to generate man pages from .org 47 ]; 48 nativeBuildInputs = [ 49 + bpftools 50 llvmPackages.clang 51 llvmPackages.llvm 52 pkg-config