pythonPackages.protobuf: Use default version of protobuf

andersk · andersk · commit 3c375e0eb20b · 2020-08-07T23:12:29.000-07:00
This has no current effect because pkgs.protobuf is pkgs.protobuf3_12,
but since we always want this to upgrade consistently with the default
version of protobuf, we might as well say so.

Signed-off-by: Anders Kaseorg &lt;andersk@mit.edu&gt;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
@@ -5370,7 +5370,9 @@ in {
   protobuf = callPackage ../development/python-modules/protobuf {
     disabled = isPyPy;
     doCheck = !isPy3k;
-    protobuf = pkgs.protobuf3_12;
+    # If a protobuf upgrade causes many Python packages to fail, please pin it
+    # here to the previous version.
+    protobuf = pkgs.protobuf;
   };
 
   psd-tools = callPackage ../development/python-modules/psd-tools { };
