From ec063ef42f93eae594e21c3f0cafc324ba7548c8 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Thu, 6 Feb 2025 14:37:33 -0800 Subject: [PATCH] Use cppitertools in MODULE.bazel https://github.com/bazelbuild/bazel-central-registry/pull/3691 landed, which provides a new-enough version that we can use directly. --- MODULE.bazel | 1 + dependency_support/load_external.bzl | 11 ----------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 042cbad232..26b85460ca 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -21,6 +21,7 @@ bazel_dep(name = "abseil-py", version = "2.1.0", repo_name = "com_google_absl_py bazel_dep(name = "bazel_features", version = "1.25.0") bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "boringssl", version = "0.20250114.0") +bazel_dep(name = "cppitertools", version = "2.2") bazel_dep(name = "googleapis", version = "0.0.0-20240819-fe8ba054a", repo_name = "com_google_googleapis") bazel_dep(name = "grpc", version = "1.69.0", repo_name = "com_github_grpc_grpc") bazel_dep(name = "nlohmann_json", version = "3.11.3.bcr.1") diff --git a/dependency_support/load_external.bzl b/dependency_support/load_external.bzl index e6d0989e7c..a037a76e18 100644 --- a/dependency_support/load_external.bzl +++ b/dependency_support/load_external.bzl @@ -97,17 +97,6 @@ def load_external_repositories(): patch_args = ["-p1"], ) - # HEAD as of 2024-10-11 on https://github.com/ryanhaining/cppitertools - # Filed https://github.com/ryanhaining/cppitertools/issues/107 to request new version to be tagged. - # Update: Tag done. Now awaiting https://github.com/bazelbuild/bazel-central-registry/pull/3691 to go in. - # After that we can add bazel_dep(name="cppitertools", version="2.2") to MODULE.bazel and remove this. - http_archive( - name = "cppitertools", - urls = ["https://github.com/ryanhaining/cppitertools/archive/3f454640b491bc13b314deddbf53b3534f6d7f1f.zip"], - strip_prefix = "cppitertools-3f454640b491bc13b314deddbf53b3534f6d7f1f", - integrity = "sha256-49xFSGD2D0equ6mOPApSfEuiObp4W1iwnQjxHahGz0Y=", - ) - # Used in C++ tests of the ZSTD Module # Version fdfb2aff released on 2024-07-31 # https://github.com/facebook/zstd/commit/fdfb2aff39dc498372d8c9e5f2330b692fea9794