Merge pull request #2235 from tweag/renovate/com_google_protobuf-28.x

mergify[bot] · web-flow · commit 5010feed92c6 · 2025-09-11T16:02:01.000Z
chore(deps): update dependency com_google_protobuf to v28
diff --git a/examples/WORKSPACE b/examples/WORKSPACE
@@ -39,6 +39,7 @@ load("@rules_nixpkgs_python//:python.bzl", "nixpkgs_python_configure")
 nixpkgs_cc_configure(
     # Don't override the default cc toolchain needed for bindist mode.
     name = "nixpkgs_config_cc",
+    cc_std = "c++14",
     repository = "@rules_haskell//nixpkgs:default.nix",
 )
 
diff --git a/examples/arm/WORKSPACE b/examples/arm/WORKSPACE
@@ -57,6 +57,7 @@ nixpkgs_cc_configure(
 nixpkgs_cc_configure(
     name = "nixpkgs_config_cc_arm",
     attribute_path = "cc-aarch64",
+    cc_std = "c++14",
     exec_constraints = [
         "@platforms//cpu:x86_64",
         "@platforms//os:linux",
diff --git a/haskell/private/com_google_protobuf-protoc-dbghlp.diff b/haskell/private/com_google_protobuf-protoc-dbghlp.diff
@@ -0,0 +1,29 @@
+diff --git a/build_defs/cpp_opts.bzl b/build_defs/cpp_opts.bzl
+index f667a4088..da463ca45 100644
+--- a/build_defs/cpp_opts.bzl
++++ b/build_defs/cpp_opts.bzl
+@@ -44,6 +44,11 @@ LINK_OPTS = select({
+         "-lm",
+         "-framework CoreFoundation",
+     ],
++    "@platforms//os:windows": [
++        "-ldbghelp",
++        "-lpthread",
++        "-lm",
++    ],
+     "//conditions:default": [
+         "-lpthread",
+         "-lm",
+diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
+index 60900d215..10c41b441 100644
+--- a/src/google/protobuf/port_def.inc
++++ b/src/google/protobuf/port_def.inc
+@@ -673,7 +673,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
+ #error PROTOBUF_DESCRIPTOR_WEAK_MESSAGES_ALLOWED was previously defined
+ #endif
+ #if defined(__GNUC__) && defined(__clang__) && !defined(__APPLE__) && \
+-    !defined(_MSC_VER)
++    !defined(_MSC_VER) && !defined(_WIN32)
+ #define PROTOBUF_DESCRIPTOR_WEAK_MESSAGES_ALLOWED
+ #endif
+ 
diff --git a/haskell/private/versions.bzl b/haskell/private/versions.bzl
@@ -14,7 +14,6 @@
 # because every bazel version tested requires a lot of space on CI
 # See https://github.com/tweag/rules_haskell/pull/1781#issuecomment-1187640454
 SUPPORTED_BAZEL_VERSIONS = [
-    "6.0.0",
     "6.3.2",
     "6.5.0",
     "7.1.0",
diff --git a/haskell/repositories.bzl b/haskell/repositories.bzl
@@ -129,11 +129,26 @@ def rules_haskell_dependencies():
     maybe(
         http_archive,
         name = "com_google_protobuf",
-        sha256 = "22fdaf641b31655d4b2297f9981fa5203b2866f8332d3c6333f6b0107bb320de",
-        strip_prefix = "protobuf-21.12",
+        sha256 = "13e7749c30bc24af6ee93e092422f9dc08491c7097efa69461f88eb5f61805ce",
+        strip_prefix = "protobuf-28.0",
         urls = [
-            "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v21.12.tar.gz",
+            "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v28.0.tar.gz",
         ],
+        patches = [
+            # see https://github.com/protocolbuffers/protobuf/issues/16844
+            # TODO: remove for protobuf version >= 32.0
+            "@rules_haskell//haskell:private/com_google_protobuf-protoc-dbghlp.diff",
+        ],
+        patch_args = ["-p1"],
+    )
+    maybe(
+        http_archive,
+        name = "com_google_absl",
+        urls = [
+            "https://github.com/abseil/abseil-cpp/releases/download/20240116.0/abseil-cpp-20240116.0.tar.gz",
+        ],
+        sha256 = "338420448b140f0dfd1a1ea3c3ce71b3bc172071f24f4d9a57d59b45037da440",
+        strip_prefix = "abseil-cpp-20240116.0",
     )
 
     maybe(
diff --git a/non_module_dev_deps.bzl b/non_module_dev_deps.bzl
@@ -103,6 +103,7 @@ def repositories(*, bzlmod):
         name = "nixpkgs_config_cc",
         repository = "@nixpkgs_default",
         register = not bzlmod,
+        cc_std = "c++14",
     )
 
     nixpkgs_package(
diff --git a/rules_haskell_tests/MODULE.bazel b/rules_haskell_tests/MODULE.bazel
@@ -119,7 +119,6 @@ use_repo(
     "asterius_bundle_linux_amd64",
     "bazel_6",
     "bazel_7",
-    "build_bazel_bazel_6_0_0",
     "build_bazel_bazel_6_3_2",
     "build_bazel_bazel_6_5_0",
     "build_bazel_bazel_7_1_0",
diff --git a/rules_haskell_tests/non_module_deps_1.bzl b/rules_haskell_tests/non_module_deps_1.bzl
@@ -89,6 +89,7 @@ filegroup(
         name = "nixpkgs_config_cc",
         repository = "@nixpkgs_default",
         register = not bzlmod,
+        cc_std = "c++14",
     )
 
     rules_haskell_asterius_toolchains(
diff --git a/rules_haskell_tests/tests/ghcWithPackages_2097/test/WORKSPACE b/rules_haskell_tests/tests/ghcWithPackages_2097/test/WORKSPACE
@@ -24,6 +24,7 @@ load(
 
 nixpkgs_cc_configure(
     name = "nixpkgs_config_cc",
+    cc_std = "c++14",
     repository = "@rules_haskell//nixpkgs:default.nix",
 )
 
diff --git a/rules_haskell_tests/tests/haskell_module/repl/haskell_module_repl_cross_library_deps_test/WORKSPACE b/rules_haskell_tests/tests/haskell_module/repl/haskell_module_repl_cross_library_deps_test/WORKSPACE
@@ -40,6 +40,7 @@ load("@rules_nixpkgs_python//:python.bzl", "nixpkgs_python_configure")
 
 nixpkgs_cc_configure(
     name = "nixpkgs_config_cc",
+    cc_std = "c++14",
     repository = "@rules_haskell//nixpkgs:default.nix",
 )
 
diff --git a/rules_haskell_tests/tests/haskell_module/repl/haskell_module_repl_test/WORKSPACE b/rules_haskell_tests/tests/haskell_module/repl/haskell_module_repl_test/WORKSPACE
@@ -41,6 +41,7 @@ load("@rules_nixpkgs_python//:python.bzl", "nixpkgs_python_configure")
 
 nixpkgs_cc_configure(
     name = "nixpkgs_config_cc",
+    cc_std = "c++14",
     repository = "@rules_haskell//nixpkgs:default.nix",
 )
 
diff --git a/rules_haskell_tests/tests/repl-targets/hs_bin_repl_test/WORKSPACE b/rules_haskell_tests/tests/repl-targets/hs_bin_repl_test/WORKSPACE
@@ -34,6 +34,7 @@ load(
 
 nixpkgs_cc_configure(
     name = "nixpkgs_config_cc",
+    cc_std = "c++14",
     repository = "@rules_haskell//nixpkgs:default.nix",
 )
 
diff --git a/rules_haskell_tests/tests/repl-targets/hs_lib_repl_test/WORKSPACE b/rules_haskell_tests/tests/repl-targets/hs_lib_repl_test/WORKSPACE
@@ -43,6 +43,7 @@ load(
 
 nixpkgs_cc_configure(
     name = "nixpkgs_config_cc",
+    cc_std = "c++14",
     repository = "@rules_haskell//nixpkgs:default.nix",
 )
 
diff --git a/rules_haskell_tests/tests/stack-snapshot-deps/hs_override_stack_test/WORKSPACE b/rules_haskell_tests/tests/stack-snapshot-deps/hs_override_stack_test/WORKSPACE
@@ -34,6 +34,7 @@ load(
 
 nixpkgs_cc_configure(
     name = "nixpkgs_config_cc",
+    cc_std = "c++14",
     repository = "@rules_haskell//nixpkgs:default.nix",
 )
 
diff --git a/start b/start
@@ -355,6 +355,7 @@ EOF
 
 		nixpkgs_cc_configure(
 		    repository = "@nixpkgs",
+		    cc_std = "c++14",
 		)
 
 		nixpkgs_python_configure(
diff --git a/tutorial/WORKSPACE b/tutorial/WORKSPACE
@@ -37,6 +37,7 @@ load(
 nixpkgs_cc_configure(
     # Don't override the default cc toolchain needed for bindist mode.
     name = "nixpkgs_config_cc",
+    cc_std = "c++14",
     repository = "@rules_haskell//nixpkgs:default.nix",
 )
 

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ load("@rules_nixpkgs_python//:python.bzl", "nixpkgs_python_configure")`
`39`	`39`	`nixpkgs_cc_configure(`
`40`	`40`	`# Don't override the default cc toolchain needed for bindist mode.`
`41`	`41`	`name = "nixpkgs_config_cc",`
	`42`	`+ cc_std = "c++14",`
`42`	`43`	`repository = "@rules_haskell//nixpkgs:default.nix",`
`43`	`44`	`)`
`44`	`45`
Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,7 @@ def repositories(*, bzlmod):`
`103`	`103`	`name = "nixpkgs_config_cc",`
`104`	`104`	`repository = "@nixpkgs_default",`
`105`	`105`	`register = not bzlmod,`
	`106`	`+ cc_std = "c++14",`
`106`	`107`	`)`
`107`	`108`
`108`	`109`	`nixpkgs_package(`
Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,7 @@ filegroup(`
`89`	`89`	`name = "nixpkgs_config_cc",`
`90`	`90`	`repository = "@nixpkgs_default",`
`91`	`91`	`register = not bzlmod,`
	`92`	`+ cc_std = "c++14",`
`92`	`93`	`)`
`93`	`94`
`94`	`95`	`rules_haskell_asterius_toolchains(`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ load(`
`24`	`24`
`25`	`25`	`nixpkgs_cc_configure(`
`26`	`26`	`name = "nixpkgs_config_cc",`
	`27`	`+ cc_std = "c++14",`
`27`	`28`	`repository = "@rules_haskell//nixpkgs:default.nix",`
`28`	`29`	`)`
`29`	`30`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ load("@rules_nixpkgs_python//:python.bzl", "nixpkgs_python_configure")`
`40`	`40`
`41`	`41`	`nixpkgs_cc_configure(`
`42`	`42`	`name = "nixpkgs_config_cc",`
	`43`	`+ cc_std = "c++14",`
`43`	`44`	`repository = "@rules_haskell//nixpkgs:default.nix",`
`44`	`45`	`)`
`45`	`46`