From 3c375e0eb20bbe1940f0da15345c9d5e079d87bd Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 7 Aug 2020 20:24:51 -0700 Subject: [PATCH] pythonPackages.protobuf: Use default version of protobuf 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 --- pkgs/top-level/python-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5341d81d03f..50bdb66bd78 100644 --- 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 { };