From b79c8acabc6b6df88233a974886715853f3b6888 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 26 Jul 2024 19:58:32 +0200 Subject: [PATCH] python312Packages.protobuf: make place for protobuf5 --- .../python-modules/protobuf/{default.nix => 4.nix} | 0 pkgs/top-level/python-packages.nix | 14 ++++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) rename pkgs/development/python-modules/protobuf/{default.nix => 4.nix} (100%) diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/4.nix similarity index 100% rename from pkgs/development/python-modules/protobuf/default.nix rename to pkgs/development/python-modules/protobuf/4.nix diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index af15cff7a2b7..085c63f7c3cc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10681,17 +10681,19 @@ self: super: with self; { proto-plus = callPackage ../development/python-modules/proto-plus { }; - # Protobuf 4.x - protobuf = callPackage ../development/python-modules/protobuf { - # If a protobuf upgrade causes many Python packages to fail, please pin it here to the previous version. - protobuf = pkgs.protobuf; - }; - # Protobuf 3.x protobuf3 = callPackage ../development/python-modules/protobuf/3.nix { protobuf = pkgs.protobuf3_20; }; + # Protobuf 4.x + protobuf4 = callPackage ../development/python-modules/protobuf/4.nix { + protobuf = pkgs.protobuf; + }; + + # If a protobuf upgrade causes many Python packages to fail, please pin it here to the previous version. + protobuf = protobuf4; + protobuf3-to-dict = callPackage ../development/python-modules/protobuf3-to-dict { }; proton-client = callPackage ../development/python-modules/proton-client { };