Merge branch 'master' into staging-next

(a trivial conflict in transmission)
This commit is contained in:
Vladimír Čunát
2021-05-09 09:31:27 +02:00
201 changed files with 2565 additions and 1560 deletions

View File

@@ -6,7 +6,7 @@
python.pkgs.buildPythonApplication rec {
pname = "bcc";
version = "0.19.0";
version = "0.20.0";
disabled = !stdenv.isLinux;
@@ -14,7 +14,7 @@ python.pkgs.buildPythonApplication rec {
owner = "iovisor";
repo = "bcc";
rev = "v${version}";
sha256 = "sha256:0k807vzznlb2icczw64ph6q28605kvghya2kd4h3c7jmap6gq1qg";
sha256 = "1xnpz2zv445dp5h0160drv6xlvrnwfj23ngc4dp3clcd59jh1baq";
};
format = "other";