diff --git a/examples/toolchains/go/MODULE.bazel b/examples/toolchains/go/MODULE.bazel index e034b2a83..40d9c23e3 100644 --- a/examples/toolchains/go/MODULE.bazel +++ b/examples/toolchains/go/MODULE.bazel @@ -18,7 +18,7 @@ local_path_override( bazel_dep(name = "platforms", version = "1.0.0") bazel_dep(name = "rules_cc", version = "0.1.4") -bazel_dep(name = "rules_go", version = "0.50.1") +bazel_dep(name = "rules_go", version = "0.60.0") nix_repo = use_extension("@rules_nixpkgs_core//extensions:repository.bzl", "nix_repo") nix_repo.file( diff --git a/testing/go-bzlmod/MODULE.bazel b/testing/go-bzlmod/MODULE.bazel index 474ea1c3b..eff43a9f6 100644 --- a/testing/go-bzlmod/MODULE.bazel +++ b/testing/go-bzlmod/MODULE.bazel @@ -24,7 +24,7 @@ local_path_override( path = "../../toolchains/java", ) -bazel_dep(name = "rules_go", version = "0.50.1") +bazel_dep(name = "rules_go", version = "0.60.0") bazel_dep(name = "rules_cc", version = "0.0.9") # TODO[AH] Remove these transitive dependencies once nixpkgs_java_configure has diff --git a/toolchains/go/go.bzl b/toolchains/go/go.bzl index a40c2ac64..9386bfc12 100644 --- a/toolchains/go/go.bzl +++ b/toolchains/go/go.bzl @@ -126,7 +126,7 @@ go_toolchain_func = """ load("@{rules_go}//go:def.bzl", "go_toolchain") PLATFORMS = {PLATFORMS} -def declare_toolchains(host_goos, host_goarch): +def declare_toolchains(host_goos, host_goarch, pack): for p in PLATFORMS: link_flags = [] cgo_link_flags = [] @@ -143,6 +143,7 @@ def declare_toolchains(host_goos, host_goarch): goarch = p.goarch, sdk = "@{sdk_repo}//:go_sdk", builder = "@{sdk_repo}//:builder", + pack = pack, link_flags = link_flags, cgo_link_flags = cgo_link_flags, visibility = ["//visibility:public"], @@ -163,7 +164,7 @@ def declare_toolchains(host_goos, host_goarch): go_toolchain_build = """ load("//:toolchain.bzl", "declare_toolchains") -declare_toolchains("{goos}", "{goarch}") +declare_toolchains("{goos}", "{goarch}", ":pack_reset") """ def _nixpkgs_go_toolchain_impl(repository_ctx):