Skip to content

Commit

Permalink
Replace rules_pkg patch with bootstrap_impl=script.
Browse files Browse the repository at this point in the history
bazelbuild/rules_python#691 removed the need
for a system python installation, removing the need for a
pkg_tar-specific patch. This fix requires rules_python >= 0.33.0 and
bazel >= 7.0.0.

Change-Id: I3f5a3ffb99ec4916908a927aaef3486072e43a92
  • Loading branch information
bmclarnon committed Mar 7, 2025
1 parent 7254e8c commit da73e38
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 41 deletions.
2 changes: 2 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ build --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1 --incompatible_strict_act
build --show_timestamps
build --@rules_rust//rust/toolchain/channel=nightly
build --incompatible_merge_fixed_and_default_shell_env # https://github.com/bazelbuild/rules_rust/issues/2665
build --@rules_python//python/config_settings:bootstrap_impl=script # https://github.com/bazelbuild/rules_python/issues/691
common --noenable_bzlmod

# Settings for remote build execution.
build:tcp-remote --experimental_allow_tags_propagation
Expand Down
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.5.0
7.5.0
15 changes: 7 additions & 8 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@ http_archive(
url = "https://github.com/bazelbuild/bazel-toolchains/archive/refs/tags/v5.1.2.tar.gz",
)

http_archive(
name = "rules_python",
sha256 = "dc6e2756130fafb90273587003659cadd1a2dfef3f6464c227794cdc01ebf70e",
strip_prefix = "rules_python-0.33.0",
url = "https://github.com/bazelbuild/rules_python/releases/download/0.33.0/rules_python-0.33.0.tar.gz",
)

http_archive(
name = "com_google_protobuf",
sha256 = "1535151efbc7893f38b0578e83cac584f2819974f065698976989ec71c1af84a",
Expand All @@ -47,7 +54,6 @@ protobuf_deps()

http_archive(
name = "rules_pkg",
patches = ["//third_party/rules_pkg:tar.patch"],
sha256 = "d20c951960ed77cb7b341c2a59488534e494d5ad1d30c4818c736d57772a9fef",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/1.0.1/rules_pkg-1.0.1.tar.gz",
Expand Down Expand Up @@ -141,13 +147,6 @@ gcc_register_toolchain(
],
)

http_archive(
name = "rules_python",
sha256 = "d71d2c67e0bce986e1c5a7731b4693226867c45bfe0b7c5e0067228a536fc580",
strip_prefix = "rules_python-0.29.0",
url = "https://github.com/bazelbuild/rules_python/releases/download/0.29.0/rules_python-0.29.0.tar.gz",
)

load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")

py_repositories()
Expand Down
Empty file removed third_party/rules_pkg/BUILD
Empty file.
32 changes: 0 additions & 32 deletions third_party/rules_pkg/tar.patch

This file was deleted.

0 comments on commit da73e38

Please sign in to comment.