diff options
| author | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2018-07-15 12:31:18 +0200 |
|---|---|---|
| committer | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2018-07-15 12:31:18 +0200 |
| commit | 18774d4173103f9274d769e36feaf8d922587e92 (patch) | |
| tree | dfa662d9cb325bd8cfb3bcd0e1e951acf9aee882 /pkgs/os-specific | |
| parent | 0ef23893277ecff1511b13eede17c336a4a4c047 (diff) | |
| parent | 64a64e7483581b2ea64b48a74671681176d14631 (diff) | |
| download | nixlib-18774d4173103f9274d769e36feaf8d922587e92.tar nixlib-18774d4173103f9274d769e36feaf8d922587e92.tar.gz nixlib-18774d4173103f9274d769e36feaf8d922587e92.tar.bz2 nixlib-18774d4173103f9274d769e36feaf8d922587e92.tar.lz nixlib-18774d4173103f9274d769e36feaf8d922587e92.tar.xz nixlib-18774d4173103f9274d769e36feaf8d922587e92.tar.zst nixlib-18774d4173103f9274d769e36feaf8d922587e92.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/bcc/default.nix | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 4f0a423600f8..3104004b3d67 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -4,14 +4,14 @@ }: python.pkgs.buildPythonApplication rec { - version = "0.5.0"; + version = "0.6.0"; name = "bcc-${version}"; src = fetchFromGitHub { - owner = "iovisor"; - repo = "bcc"; - rev = "v${version}"; - sha256 = "0bb3244xll5sqx0lvrchg71qy2zg0yj6r5h4v5fvrg1fjhaldys9"; + owner = "iovisor"; + repo = "bcc"; + rev = "v${version}"; + sha256 = "1fk2kvbdvm87rkha2cigz2qhhlrni4g0dcnmiiyya79y85ahfvga"; }; format = "other"; @@ -23,12 +23,6 @@ python.pkgs.buildPythonApplication rec { ]; patches = [ - # fix build with llvm > 5.0.0 && < 6.0.0 - (fetchpatch { - url = "https://github.com/iovisor/bcc/commit/bd7fa55bb39b8978dafd0b299e35616061e0a368.patch"; - sha256 = "1sgxhsq174iihyk1x08py73q8fh78d7y3c90k5nh8vcw2pf1xbnf"; - }) - # This is needed until we fix # https://github.com/NixOS/nixpkgs/issues/40427 ./fix-deadlock-detector-import.patch |