Merge remote-tracking branch 'upstream/master' into staging

2018-07-09 11:58:38 -04:00
parent 98b5258955 ef2ac673a1
commit 6eb508a3e8
441 changed files with 11813 additions and 9152 deletions
--- a/pkgs/development/python-modules/grpcio/default.nix
+++ b/pkgs/development/python-modules/grpcio/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {

  meta = with stdenv.lib; {
    description = "HTTP/2-based RPC framework";
-    license = lib.licenses.bsd3;
+    license = lib.licenses.asl20;
    homepage = "https://grpc.io/grpc/python/";
    maintainers = with maintainers; [ vanschelven ];
  };