Merge pull request #94920 from andersk/python-protobuf-default

pythonPackages.protobuf: Use default version of protobuf
This commit is contained in:
Benjamin Hipple 2020-08-08 14:03:15 -04:00 committed by GitHub
commit aed5964378
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -5380,7 +5380,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 { };