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: protocolbuffers/protobuf@v25.4...v28.0
NixOS · Sep 1, 2024 · 7cdaa0b · 7cdaa0b
1 parent e37d7da
commit 7cdaa0b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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 { };
-Original file line number
+Diff line change
@@ Expand Up / @@ -23147,7 +23147,7 @@ with pkgs; @@
       prospector = callPackage ../development/tools/prospector { };
-      protobuf = protobuf_25;
+      protobuf = protobuf_28;
       inherit
         ({
@@ Expand Down @@