From 7cdaa0b80c9da64b2acb6cc8e8f73d2f4489aaeb Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 1 Sep 2024 22:06:00 +0200
Subject: [PATCH] protobuf: protobuf_25 -> protobuf_28

Bump default protobuf from 25.4 to 28.0, as well as the corresponding
python package.

Changelog:
https://github.com/protocolbuffers/protobuf/releases/tag/v28.0

Diff: https://github.com/protocolbuffers/protobuf/compare/v25.4...v28.0
---
 pkgs/development/libraries/protobuf/generic.nix | 6 ++----
 pkgs/top-level/all-packages.nix                 | 2 +-
 pkgs/top-level/python-packages.nix              | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix
index 71f8e90b774a2..7fcabb9f1836d 100644
--- a/pkgs/development/libraries/protobuf/generic.nix
+++ b/pkgs/development/libraries/protobuf/generic.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "protocolbuffers";
     repo = "protobuf";
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
     inherit hash;
   };
 
@@ -89,9 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     tests = {
-      pythonProtobuf = python3.pkgs.protobuf.override (_: {
-        protobuf = finalAttrs.finalPackage;
-      });
+      pythonProtobuf = python3.pkgs.protobuf;
       inherit grpc;
     };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ce1cdfdeff141..9f43ea8d398c6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23147,7 +23147,7 @@ with pkgs;
 
   prospector = callPackage ../development/tools/prospector { };
 
-  protobuf = protobuf_25;
+  protobuf = protobuf_28;
 
   inherit
     ({
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 079d58d61c12d..b5e3f377a07b8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10894,7 +10894,7 @@ self: super: with self; {
   protobuf5 = callPackage ../development/python-modules/protobuf/default.nix { };
 
   # If a protobuf upgrade causes many Python packages to fail, please pin it here to the previous version.
-  protobuf = protobuf4;
+  protobuf = protobuf5;
 
   protobuf3-to-dict = callPackage ../development/python-modules/protobuf3-to-dict { };