Merge branch 'master' into staging-next

Hydra: ?compare=1468896
2018-07-14 18:12:49 +02:00
parent 4bd4e3ef5c 6d0578934f
commit 0f01215203
721 changed files with 20508 additions and 20874 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 ];
  };