Merge branch 'master' into staging-next

2020-12-31 07:31:38 +01:00
parent 572a864d02 7a580a1219
commit f19b7b03a0
41 changed files with 1842 additions and 1213 deletions
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
    description = "A tracepoint-based system tracing tool for Linux (with clients for other OSes)";
    license = with licenses; [ asl20 gpl2 mit ];
    maintainers = [maintainers.raskin];
-    platforms = ["x86_64-linux"] ++ platforms.darwin;
+    platforms = [ "x86_64-linux" "aarch64-linux" ] ++ platforms.darwin;
    broken = kernel != null && versionOlder kernel.version "4.14";
    homepage = "https://sysdig.com/opensource/";
    downloadPage = "https://github.com/draios/sysdig/releases";