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
@@ -45,6 +45,6 @@ rustPlatform.buildRustPackage rec {
    changelog = "https://github.com/lu-zero/cargo-c/releases/tag/v${version}";
    license = licenses.mit;
    platforms = platforms.unix;
-    maintainers = with maintainers; [ primeos ];
+    maintainers = with maintainers; [ ];
  };
 }