pyrox.dev / nixpkgs
lol
fork atom

Merge #175467: libbpf 0.7.0 -> 0.8.0, bpftrace: 0.14.1 -> 0.15.0

Vladimír Čunát 89821987 95e157f6

+6 -51
unified split
-39
pkgs/os-specific/linux/bpftrace/btf-dump-new-0.6.0.patch
··· 1 - diff -ur source/src/btf.cpp new/src/btf.cpp 2 - --- source/src/btf.cpp 1970-01-01 09:00:01.000000000 +0900 3 - +++ new/src/btf.cpp 2021-12-04 21:46:59.337023489 +0900 4 - @@ -225,7 +225,7 @@ 5 - char err_buf[256]; 6 - int err; 7 - 8 - - dump = btf_dump__new(btf, nullptr, &opts, dump_printf); 9 - + dump = btf_dump__new_deprecated(btf, nullptr, &opts, dump_printf); 10 - err = libbpf_get_error(dump); 11 - if (err) 12 - { 13 - @@ -496,7 +496,7 @@ 14 - char err_buf[256]; 15 - int err; 16 - 17 - - dump = btf_dump__new(btf, nullptr, &opts, dump_printf); 18 - + dump = btf_dump__new_deprecated(btf, nullptr, &opts, dump_printf); 19 - err = libbpf_get_error(dump); 20 - if (err) 21 - { 22 - @@ -554,7 +554,7 @@ 23 - char err_buf[256]; 24 - int err; 25 - 26 - - dump = btf_dump__new(btf, nullptr, &opts, dump_printf); 27 - + dump = btf_dump__new_deprecated(btf, nullptr, &opts, dump_printf); 28 - err = libbpf_get_error(dump); 29 - if (err) 30 - { 31 - @@ -648,7 +648,7 @@ 32 - char err_buf[256]; 33 - int err; 34 - 35 - - dump = btf_dump__new(btf, nullptr, &opts, dump_printf); 36 - + dump = btf_dump__new_deprecated(btf, nullptr, &opts, dump_printf); 37 - err = libbpf_get_error(dump); 38 - if (err) 39 - {
+2 -7
pkgs/os-specific/linux/bpftrace/default.nix
··· 9 9 10 10 stdenv.mkDerivation rec { 11 11 pname = "bpftrace"; 12 - version = "0.14.1"; 12 + version = "0.15.0"; 13 13 14 14 # Cherry-picked from merged PR, remove this hook on next update 15 15 # https://github.com/iovisor/bpftrace/pull/2242 ··· 33 33 owner = "iovisor"; 34 34 repo = "bpftrace"; 35 35 rev = "v${version}"; 36 - sha256 = "sha256-QDqHAEVM/XHCFMS0jMLdKJfDUOpkUqONOf8+Fbd5dCY="; 36 + sha256 = "sha256-9adZAKSn00W2yNwVDbVB1/O5Y+10c4EkVJGCHyd4Tgg="; 37 37 }; 38 - 39 - # libbpf 0.6.0 relies on typeof in bpf/btf.h to pick the right version of 40 - # btf_dump__new() but that's not valid c++. 41 - # see https://github.com/iovisor/bpftrace/issues/2068 42 - patches = [ ./btf-dump-new-0.6.0.patch ]; 43 38 44 39 buildInputs = with llvmPackages; 45 40 [ llvm libclang
+4 -5
pkgs/os-specific/linux/libbpf/default.nix
··· 1 1 { fetchFromGitHub 2 - , fetchpatch 3 - , libelf 2 + , elfutils 4 3 , pkg-config 5 4 , stdenv 6 5 , zlib ··· 10 9 11 10 stdenv.mkDerivation rec { 12 11 pname = "libbpf"; 13 - version = "0.7.0"; 12 + version = "0.8.0"; 14 13 15 14 src = fetchFromGitHub { 16 15 owner = "libbpf"; 17 16 repo = "libbpf"; 18 17 rev = "v${version}"; 19 - sha256 = "sha256-NFVJ8JquWVzu+QoaaOMzhnu6/IqdP1FPhtJFidXA4L4="; 18 + sha256 = "sha256-D2ASqSZFNShCdRCH8LDocLP/O4sME9nT73rk1KsJeJE="; 20 19 }; 21 20 22 21 nativeBuildInputs = [ pkg-config ]; 23 - buildInputs = [ libelf zlib ]; 22 + buildInputs = [ elfutils zlib ]; 24 23 25 24 enableParallelBuilding = true; 26 25 makeFlags = [ "PREFIX=$(out)" "-C src" ];