From 2ba94f5ba87aeafcabd8bf7539e7669a2e24badc Mon Sep 17 00:00:00 2001 From: Malte Poll <1780588+malt3@users.noreply.github.com> Date: Tue, 21 May 2024 13:28:40 +0200 Subject: [PATCH] bazel: migrate rules_pkg to bzlmod --- MODULE.bazel | 1 + WORKSPACE.bzlmod | 9 --------- bazel/toolchains/pkg_deps.bzl | 15 --------------- 3 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 bazel/toolchains/pkg_deps.bzl diff --git a/MODULE.bazel b/MODULE.bazel index de556a24d..04e361980 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -3,3 +3,4 @@ module(name = "constellation") bazel_dep(name = "bazel_skylib", version = "1.6.1") bazel_dep(name = "hermetic_cc_toolchain", version = "3.1.0") bazel_dep(name = "rules_cc", version = "0.0.9") +bazel_dep(name = "rules_pkg", version = "0.10.1") diff --git a/WORKSPACE.bzlmod b/WORKSPACE.bzlmod index 0d1ddde26..34aa641e8 100644 --- a/WORKSPACE.bzlmod +++ b/WORKSPACE.bzlmod @@ -255,15 +255,6 @@ register_toolchains( "@zig_sdk//toolchain:windows_amd64", ) -# Packaging rules (tar) -load("//bazel/toolchains:pkg_deps.bzl", "pkg_deps") - -pkg_deps() - -load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies") - -rules_pkg_dependencies() - # Aspect Bazel Lib load("//bazel/toolchains:aspect_bazel_lib.bzl", "aspect_bazel_lib") diff --git a/bazel/toolchains/pkg_deps.bzl b/bazel/toolchains/pkg_deps.bzl deleted file mode 100644 index 5a4928141..000000000 --- a/bazel/toolchains/pkg_deps.bzl +++ /dev/null @@ -1,15 +0,0 @@ -"""rules_pkg dependencies""" - -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - -def pkg_deps(): - http_archive( - name = "rules_pkg", - urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.10.1/rules_pkg-0.10.1.tar.gz", - "https://cdn.confidential.cloud/constellation/cas/sha256/d250924a2ecc5176808fc4c25d5cf5e9e79e6346d79d5ab1c493e289e722d1d0", - "https://github.com/bazelbuild/rules_pkg/releases/download/0.10.1/rules_pkg-0.10.1.tar.gz", - ], - sha256 = "d250924a2ecc5176808fc4c25d5cf5e9e79e6346d79d5ab1c493e289e722d1d0", - type = "tar.gz", - )