summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Lepage <gaetan@glepage.com>2023-12-01 08:11:06 +0100
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2023-12-07 17:48:48 +0000
commit793d11edc777e23f577200bf439ec7e823e90d12 (patch)
tree3a44e4068c0f640b7ade943e2a4aefadfd09796a
parentlibGLU: fix on darwin (diff)
downloadnixpkgs-origin/backport-272493-to-release-23.11.tar.gz
Changelog: https://github.com/protocolbuffers/protobuf/releases/tag/v25.1 (cherry picked from commit 1eeae0e0246e169539462b44000cdb7b66e52b63)
-rw-r--r--pkgs/development/libraries/protobuf/25.nix6
-rw-r--r--pkgs/top-level/all-packages.nix3
2 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/development/libraries/protobuf/25.nix b/pkgs/development/libraries/protobuf/25.nix
new file mode 100644
index 000000000000..b994f6060942
--- /dev/null
+++ b/pkgs/development/libraries/protobuf/25.nix
@@ -0,0 +1,6 @@
+{ callPackage, ... } @ args:
+
+callPackage ./generic.nix ({
+ version = "25.1";
+ hash = "sha256-w6556kxftVZ154LrZB+jv9qK+QmMiUOGj6EcNwiV+yo=";
+} // args)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c76e9e32d8e..f6e9ed6b5a9a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24610,6 +24610,9 @@ with pkgs;
protobuf = protobuf_24;
+ protobuf_25 = callPackage ../development/libraries/protobuf/25.nix {
+ abseil-cpp = abseil-cpp_202308;
+ };
protobuf_24 = callPackage ../development/libraries/protobuf/24.nix { };
protobuf_23 = callPackage ../development/libraries/protobuf/23.nix { };
protobuf_21 = callPackage ../development/libraries/protobuf/21.nix {