From 1ceb357d6cc3775eb7052bb61963443651c1ca0c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 06:31:52 +0000 Subject: [PATCH 1/3] Update dependency com_google_protobuf to v26 --- haskell/repositories.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/haskell/repositories.bzl b/haskell/repositories.bzl index dfba5e8ee..619c3c167 100644 --- a/haskell/repositories.bzl +++ b/haskell/repositories.bzl @@ -121,10 +121,10 @@ def rules_haskell_dependencies(): maybe( http_archive, name = "com_google_protobuf", - sha256 = "22fdaf641b31655d4b2297f9981fa5203b2866f8332d3c6333f6b0107bb320de", - strip_prefix = "protobuf-21.12", + sha256 = "4fc5ff1b2c339fb86cd3a25f0b5311478ab081e65ad258c6789359cd84d421f8", + strip_prefix = "protobuf-26.1", urls = [ - "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v21.12.tar.gz", + "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v26.1.tar.gz", ], ) From d41c9e418b0ee31af9aec71595f36e6f9660a97e Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Tue, 14 May 2024 07:49:10 +0200 Subject: [PATCH 2/3] Add `com_google_absl` to dependencies It is needed by com_google_protobuf. --- haskell/repositories.bzl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/haskell/repositories.bzl b/haskell/repositories.bzl index 619c3c167..d006bcac5 100644 --- a/haskell/repositories.bzl +++ b/haskell/repositories.bzl @@ -127,6 +127,15 @@ def rules_haskell_dependencies(): "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v26.1.tar.gz", ], ) + 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( http_archive, From e983e400031ebe1b7bad14e68a7310153fef696d Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Mon, 13 May 2024 17:57:08 +0200 Subject: [PATCH 3/3] Use 2014 ISO C++ standard on the host to compile abseil-cpp --- rules_haskell_tests/.bazelrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rules_haskell_tests/.bazelrc b/rules_haskell_tests/.bazelrc index 43a3ba1dd..34a34677d 100644 --- a/rules_haskell_tests/.bazelrc +++ b/rules_haskell_tests/.bazelrc @@ -1,6 +1,9 @@ import %workspace%/../.bazelrc.common import %workspace%/.bazelrc.bzlmod +# abseil c++ (a dependency of protobuf) needs a C++14 compiler, but rules_nixpkgs cc sets `-std=c++0x` +build:nixpkgs --host_cxxopt=-std=c++14 + # User Configuration # ------------------ try-import %workspace%/.bazelrc.local