Unverified Commit b38903da authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #285921: grpc: 1.60.0 -> 1.61.0

...into staging-next
parents f732e146 6187ac43
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@

stdenv.mkDerivation rec {
  pname = "grpc";
  version = "1.60.0"; # N.B: if you change this, please update:
  version = "1.61.0"; # N.B: if you change this, please update:
    # pythonPackages.grpcio-tools
    # pythonPackages.grpcio-status

@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
    owner = "grpc";
    repo = "grpc";
    rev = "v${version}";
    hash = "sha256-0mn+nQAgaurd1WomzcLUAYwp88l26qGkP+cP1SSYxsE=";
    hash = "sha256-NLxcGFQ1F5RLoSFC0XYMjvGXkSWc/vLzgtk5qsOndEo=";
    fetchSubmodules = true;
  };

+2 −2
Original line number Diff line number Diff line
@@ -9,14 +9,14 @@

buildPythonPackage rec {
  pname = "grpcio-status";
  version = "1.60.0";
  version = "1.60.1";
  format = "setuptools";

  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
    hash = "sha256-8Q4LbbOtwP3CRLcZYoFO6YKZbvBhhkRrVpW5+mNaoas=";
    hash = "sha256-YbWquJiUmOiqFCwguIgp6l2Q0YwYyFO5+ebUB9N7+LQ=";
  };

  postPatch = ''
+2 −2
Original line number Diff line number Diff line
@@ -9,14 +9,14 @@

buildPythonPackage rec {
  pname = "grpcio-testing";
  version = "1.60.0";
  version = "1.60.1";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
    hash = "sha256-XF+za8O9x4m/8ewEBQG5reoPiK64vh7VyA1oic0Jq0A=";
    hash = "sha256-vvrZX0fes/OTTr1VEpl0jqo/Y+44btlq1pemZFNWixc=";
  };

  postPatch = ''
+2 −2
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@

buildPythonPackage rec {
  pname = "grpcio-tools";
  version = "1.60.0";
  version = "1.60.1";
  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
    hash = "sha256-7TBJk0AijXM/9p/PSmZZDteSH5TrWiv2kiWLEoC52sc=";
    hash = "sha256-2ggiSrhnXG1GS5iL2MoCzM0r8Cdbzu/o9iGb/UpPXoU=";
  };

  postPatch = ''
+2 −2
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@
buildPythonPackage rec {
  pname = "grpcio";
  format = "setuptools";
  version = "1.60.0";
  version = "1.60.1";

  src = fetchPypi {
    inherit pname version;
    hash = "sha256-IZkWWhr/tmaqJK3wyXQ2aG0KYbxfwRPAN3Aft8f865Y=";
    hash = "sha256-3R06jR0uUK2bWeEKp/B8fRvis2fz8tM8X63pbtVGCWI=";
  };

  outputs = [ "out" "dev" ];