From e93470227b54243de33695d2042854ec85b27309 Mon Sep 17 00:00:00 2001 From: Fabian Meumertzheim Date: Thu, 16 May 2024 11:02:21 +0200 Subject: [PATCH] Mark module extension as reproducible This removes an unnecessary lockfile entry. --- MODULE.bazel | 2 +- crosstool/setup.bzl | 5 +++-- lib/repositories.bzl | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 20dea49..1f5334d 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -7,7 +7,7 @@ module( ) bazel_dep(name = "bazel_features", version = "1.10.0") -bazel_dep(name = "bazel_skylib", version = "1.3.0") +bazel_dep(name = "bazel_skylib", version = "1.6.1") bazel_dep(name = "platforms", version = "0.0.9") bazel_dep( diff --git a/crosstool/setup.bzl b/crosstool/setup.bzl index f3f7090..51ddeef 100644 --- a/crosstool/setup.bzl +++ b/crosstool/setup.bzl @@ -1,5 +1,6 @@ """Configure the Apple CC toolchain""" +load("@bazel_skylib//lib:modules.bzl", "modules") load("//crosstool:osx_cc_configure.bzl", "configure_osx_toolchain") _DISABLE_ENV_VAR = "BAZEL_NO_APPLE_CPP_TOOLCHAIN" @@ -77,8 +78,8 @@ def apple_cc_configure(): "@local_config_apple_cc_toolchains//:all", ) -def _apple_cc_configure_extension_impl(_): +def _apple_cc_configure_extension_impl(): _apple_cc_autoconf_toolchains(name = "local_config_apple_cc_toolchains") _apple_cc_autoconf(name = "local_config_apple_cc") -apple_cc_configure_extension = module_extension(implementation = _apple_cc_configure_extension_impl) +apple_cc_configure_extension = modules.as_extension(_apple_cc_configure_extension_impl) diff --git a/lib/repositories.bzl b/lib/repositories.bzl index 9f8de07..53136d4 100644 --- a/lib/repositories.bzl +++ b/lib/repositories.bzl @@ -40,10 +40,10 @@ def apple_support_dependencies(): http_archive, name = "bazel_skylib", urls = [ - "https://github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz", - "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-1.6.1.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-1.6.1.tar.gz", ], - sha256 = "74d544d96f4a5bb630d465ca8bbcfe231e3594e5aae57e1edbf17a6eb3ca2506", + sha256 = "9f38886a40548c6e96c106b752f242130ee11aaa068a56ba7e56f4511f33e4f2", ) _maybe(