From 5aa7c0c8252a7ddcb7e467cf7b4681c6237a9310 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 22 Jun 2020 00:03:03 +0200 Subject: [PATCH] protobuf: make 3.12.x default --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6f681ba5bb2..d2f81401579b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14402,7 +14402,7 @@ in python = python37; }; - protobuf = protobuf3_8; + protobuf = protobuf3_12; protobuf3_12 = callPackage ../development/libraries/protobuf/3.12.nix { }; protobuf3_11 = callPackage ../development/libraries/protobuf/3.11.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 626ed1d57f87..1a934f8cf304 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5322,7 +5322,7 @@ in { protobuf = callPackage ../development/python-modules/protobuf { disabled = isPyPy; doCheck = !isPy3k; - protobuf = pkgs.protobuf3_8; + protobuf = pkgs.protobuf3_12; }; psd-tools = callPackage ../development/python-modules/psd-tools { };