Merge remote-tracking branch 'origin/master' into staging-next

Fix cargo-flash build
2021-05-16 18:27:14 -07:00
parent 6020fe2508 8aea69e5ab
commit d8e62d8e41
80 changed files with 906 additions and 354 deletions
@@ -49,6 +49,6 @@ rustPlatform.buildRustPackage rec {
    homepage = "https://github.com/xiph/rav1e";
    changelog = "https://github.com/xiph/rav1e/releases/tag/v${version}";
    license = licenses.bsd2;
-    maintainers = [ maintainers.primeos ];
+    maintainers = [ ];
  };
 }