Merge master into staging-next

2020-03-12 11:30:04 +01:00
parent f8bf6f087e 73fa45693c
commit 8fa5eb488b
162 changed files with 5196 additions and 3915 deletions
@@ -98,7 +98,7 @@ python3Packages.buildPythonApplication rec {
    homepage = https://mesonbuild.com;
    description = "SCons-like build system that use python as a front-end language and Ninja as a building backend";
    license = licenses.asl20;
-    maintainers = with maintainers; [ mbe rasendubi ];
+    maintainers = with maintainers; [ jtojnar mbe rasendubi ];
    platforms = platforms.all;
  };
 }