Merge pull request #57181 from FlorianFranzen/protobuf

protobuf: 3.6 -> 3.7

pkgs/development/libraries/protobuf/3.6.nix

···
 { callPackage, ... }:
 
 callPackage ./generic-v3.nix {
-  version = "3.6.1";
-  sha256 = "1bg40miylzpy2wgbd7l7zjgmk43l12q38fq0zkn0vzy1lsj457sq";
+  version = "3.6.1.3";
+  sha256 = "1spj0d4flx6h3phxx3sg9r00yv734hina3365avkcz9brnm089c1";
 }

pkgs/development/libraries/protobuf/3.7.nix

···
+{ callPackage, ... }:
+
+callPackage ./generic-v3.nix {
+  version = "3.7.0";
+  sha256 = "0nlxif4cajqllsj2vdh7zp14ag48fb8lsa64zmq8625q9m2lcmdh";
+}

pkgs/development/python-modules/protobuf/default.nix

···
   nativeBuildInputs = [ google_apputils pyext ];
   buildInputs = [ protobuf ];
 
-  patches = optional isPy37
-    # Python 3.7 compatibility (remove when protobuf 3.7 is released)
+  patches = optional (isPy37 && (versionOlder protobuf.version "3.6.1.2"))
+    # Python 3.7 compatibility (not needed for protobuf >= 3.6.1.2)
     (fetchpatch {
       url = "https://github.com/protocolbuffers/protobuf/commit/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.patch";
       sha256 = "09hw22y3423v8bbmc9xm07znwdxfbya6rp78d4zqw6fisdvjkqf1";
···
 
   preBuild = ''
     # Workaround for https://github.com/google/protobuf/issues/2895
-    ${python}/bin/${python.executable} setup.py build
+    ${python.interpreter} setup.py build
   '' + optionalString (versionAtLeast protobuf.version "2.6.0") ''
-    ${python}/bin/${python.executable} setup.py build_ext --cpp_implementation
+    ${python.interpreter} setup.py build_ext --cpp_implementation
   '';
 
   installFlags = optional (versionAtLeast protobuf.version "2.6.0")

pkgs/top-level/all-packages.nix

···
     buildPythonApplication click future six;
   };
 
-  protobuf = protobuf3_6;
+  protobuf = protobuf3_7;
 
+  protobuf3_7 = callPackage ../development/libraries/protobuf/3.7.nix { };
   protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { };
   protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix { };
   protobuf3_4 = callPackage ../development/libraries/protobuf/3.4.nix { };