Merge master into staging-next

2020-06-16 18:05:38 +02:00
parent 7e5769c70c 4fbf2d1b1b
commit 4af4a49251
117 changed files with 1171 additions and 587 deletions
@@ -243,7 +243,7 @@ stdenv.mkDerivation rec {
    homepage = "http://golang.org/";
    description = "The Go Programming language";
    license = licenses.bsd3;
-    maintainers = with maintainers; [ cstrahan orivej mic92 rvolosatovs kalbasit Frostman ];
+    maintainers = teams.golang.members;
    platforms = platforms.linux ++ platforms.darwin;
  };
 }