public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linuxPackages.bcc: 0.8.0 -> 0.9.0

Browse Source 
Requires a minor tweak to the deadlock detector patch (the file was
renamed in the upstream repo).

bcc now also wants a copy of libbpf, which it doesn't have in the source
release tarball. Clone a copy from GiHub that's synchronized with the
release, and put it in place.

Tested on Linux 5.1 (with bpftrace as well).

Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2019-05-06 01:12:02 -05:00
parent 181e971755
commit 0a4cd28f84
No known key found for this signature in database
GPG Key ID: 25D2038DEB08021D
2 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
pkgs/os-specific/linux/bcc/default.nix
View File

@ -4,20 +4,33 @@
}: }:
python.pkgs.buildPythonApplication rec { python.pkgs.buildPythonApplication rec {
version = "0.8.0"; version = "0.9.0";
name = "bcc-${version}"; name = "bcc-${version}";
src = fetchFromGitHub { srcs = [
owner = "iovisor"; (fetchFromGitHub {
repo = "bcc"; owner = "iovisor";
rev = "v${version}"; repo = "bcc";
sha256 = "15vvybllmh9hdj801v3psd671c0qq2a1xdv73kabb9r4fzgaknxk"; rev = "v${version}";
}; sha256 = "0gi12bsjaw1d77rx11wkdg4szcydwy55z6mkx558nfvdym0qj7yw";
name = "bcc";
})
# note: keep this in sync with the version that was used at the time of the
# tagged release!
(fetchFromGitHub {
owner = "libbpf";
repo = "libbpf";
rev = "5beb8a2ebffd1045e3edb9b522d6ff5bb477c541";
sha256 = "19n6baqj0mbaphzxkpn09m5a7cbij7fxap8ckk488nxqdz7nbsal";
name = "libbpf";
})
];
sourceRoot = "bcc";
format = "other"; format = "other";
buildInputs = [ buildInputs = with llvmPackages; [
llvmPackages.llvm llvmPackages.clang-unwrapped kernel llvm clang-unwrapped kernel
elfutils luajit netperf iperf elfutils luajit netperf iperf
systemtap.stapBuild flex systemtap.stapBuild flex
]; ];
@ -28,6 +41,7 @@ python.pkgs.buildPythonApplication rec {
./fix-deadlock-detector-import.patch ./fix-deadlock-detector-import.patch
]; ];
propagatedBuildInputs = [ python.pkgs.netaddr ];
nativeBuildInputs = [ makeWrapper cmake flex bison ] nativeBuildInputs = [ makeWrapper cmake flex bison ]
# libelf is incompatible with elfutils-libelf # libelf is incompatible with elfutils-libelf
++ stdenv.lib.filter (x: x != libelf) kernel.moduleBuildDependencies; ++ stdenv.lib.filter (x: x != libelf) kernel.moduleBuildDependencies;
@ -44,9 +58,11 @@ python.pkgs.buildPythonApplication rec {
patch -p1 < libbcc-path.patch patch -p1 < libbcc-path.patch
''; '';
propagatedBuildInputs = [ preConfigure = ''
python.pkgs.netaddr chmod -R u+w ../libbpf/
]; rmdir src/cc/libbpf
(cd src/cc && ln -svf ../../../libbpf/ libbpf)
'';
postInstall = '' postInstall = ''
mkdir -p $out/bin $out/share mkdir -p $out/bin $out/share
@ -71,8 +87,8 @@ python.pkgs.buildPythonApplication rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Dynamic Tracing Tools for Linux"; description = "Dynamic Tracing Tools for Linux";
homepage = https://iovisor.github.io/bcc/; homepage = https://iovisor.github.io/bcc/;
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ ragge mic92 ]; maintainers = with maintainers; [ ragge mic92 thoughtpolice ];
}; };
} }

4
pkgs/os-specific/linux/bcc/fix-deadlock-detector-import.patch
View File

@ -1,5 +1,5 @@
--- source.org/tools/deadlock_detector.py 1980-01-02 00:00:00.000000000 +0000 --- source.org/tools/deadlock.py 1980-01-02 00:00:00.000000000 +0000
+++ source/tools/deadlock_detector.py 2018-05-29 13:57:11.807126673 +0100 +++ source/tools/deadlock.py 2018-05-29 13:57:11.807126673 +0100
@@ -44,9 +44,8 @@ @@ -44,9 +44,8 @@
# #
# 01-Feb-2017 Kenny Yu Created this. # 01-Feb-2017 Kenny Yu Created this.