Merge staging-next into staging

2021-05-04 18:21:27 +00:00
parent dfafc173e0 0ef4d5f1f6
commit 4cbb35eba8
37 changed files with 4129 additions and 5137 deletions
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
    description = "A system call tracer for Linux";
    license =  with licenses; [ lgpl21Plus gpl2Plus ]; # gpl2Plus is for the test suite
    platforms = platforms.linux;
-    maintainers = with maintainers; [ globin ma27 ];
+    maintainers = with maintainers; [ globin ma27 qyliss ];
  };
 }