summary refs log tree commit diff
path: root/pkgs/os-specific/linux/bcc
diff options
context:
space:
mode:
authorArtturi <Artturin@artturin.com>2021-11-01 11:03:55 +0200
committerGitHub <noreply@github.com>2021-11-01 11:03:55 +0200
commit73951697f00d01acb2c680e6916580d9eccaff85 (patch)
treed28116e390fe89c9987173dff2453226dcb33ed3 /pkgs/os-specific/linux/bcc
parentcf6e529bfb538ac3863982470263a3a11132e8e2 (diff)
parenta7ad7f05bd1f5578486165d67d047c48acdfeeeb (diff)
downloadnixpkgs-73951697f00d01acb2c680e6916580d9eccaff85.tar
nixpkgs-73951697f00d01acb2c680e6916580d9eccaff85.tar.gz
nixpkgs-73951697f00d01acb2c680e6916580d9eccaff85.tar.bz2
nixpkgs-73951697f00d01acb2c680e6916580d9eccaff85.tar.lz
nixpkgs-73951697f00d01acb2c680e6916580d9eccaff85.tar.xz
nixpkgs-73951697f00d01acb2c680e6916580d9eccaff85.tar.zst
nixpkgs-73951697f00d01acb2c680e6916580d9eccaff85.zip
Merge pull request #139867 from Mic92/bcc
Diffstat (limited to 'pkgs/os-specific/linux/bcc')
-rw-r--r--pkgs/os-specific/linux/bcc/default.nix9
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix
index 221f38faa87..5ed8f496fc9 100644
--- a/pkgs/os-specific/linux/bcc/default.nix
+++ b/pkgs/os-specific/linux/bcc/default.nix
@@ -1,12 +1,12 @@
 { lib, stdenv, fetchFromGitHub
 , makeWrapper, cmake, llvmPackages, kernel
 , flex, bison, elfutils, python, luajit, netperf, iperf, libelf
-, systemtap, bash, libbpf
+, systemtap, bash
 }:
 
 python.pkgs.buildPythonApplication rec {
   pname = "bcc";
-  version = "0.20.0";
+  version = "0.22.0";
 
   disabled = !stdenv.isLinux;
 
@@ -14,7 +14,8 @@ python.pkgs.buildPythonApplication rec {
     owner = "iovisor";
     repo = "bcc";
     rev = "v${version}";
-    sha256 = "1xnpz2zv445dp5h0160drv6xlvrnwfj23ngc4dp3clcd59jh1baq";
+    sha256 = "sha256-7FQz02APzjCjxCaw+e3H2GWz+UKsH0Dzgk9LoDgwDpU=";
+    fetchSubmodules = true;
   };
   format = "other";
 
@@ -22,7 +23,6 @@ python.pkgs.buildPythonApplication rec {
     llvm llvm.dev libclang kernel
     elfutils luajit netperf iperf
     systemtap.stapBuild flex bash
-    libbpf
   ];
 
   patches = [
@@ -41,7 +41,6 @@ python.pkgs.buildPythonApplication rec {
     "-DREVISION=${version}"
     "-DENABLE_USDT=ON"
     "-DENABLE_CPP_API=ON"
-    "-DCMAKE_USE_LIBBPF_PACKAGE=ON"
   ];
 
   postPatch = ''