Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2020-08-17 14:54:39 +02:00
531 changed files with 2778 additions and 6274 deletions
@@ -49,6 +49,5 @@ rustPlatform.buildRustPackage {
homepage = "https://github.com/rust-lang/rls/";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ symphorien ];
platforms = platforms.all;
};
}
@@ -26,6 +26,5 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/rust-lang-nursery/rustfmt";
license = with licenses; [ mit asl20 ];
maintainers = with maintainers; [ globin basvandijk ];
platforms = platforms.all;
};
}