From 30e059d652bd4e352e2c1dc3c44d03a1e42ff912 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Fri, 12 May 2023 08:13:21 +0100 Subject: [PATCH 2/2] nixpkgs: use system Go --- bazel/dependency_imports.bzl | 29 +---------------------------- bazel/repositories.bzl | 3 --- 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl index 681617f1b8..a10c560baf 100644 --- a/bazel/dependency_imports.bzl +++ b/bazel/dependency_imports.bzl @@ -17,7 +17,7 @@ load("@aspect_bazel_lib//lib:repositories.bzl", "register_jq_toolchains", "regis load("@com_google_cel_cpp//bazel:deps.bzl", "parser_deps") # go version for rules_go -GO_VERSION = "1.18" +GO_VERSION = "host" JQ_VERSION = "1.6" YQ_VERSION = "4.24.4" @@ -27,7 +27,6 @@ def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, y rules_foreign_cc_dependencies(register_default_tools = False, register_built_tools = False) go_rules_dependencies() go_register_toolchains(go_version) - envoy_download_go_sdks(go_version) gazelle_dependencies(go_sdk = "go_sdk") apple_rules_dependencies() pip_dependencies() @@ -146,29 +145,3 @@ def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, y # use_category = ["api"], # source = "https://github.com/bufbuild/protoc-gen-validate/blob/v0.6.1/dependencies.bzl#L23-L28" ) - -def envoy_download_go_sdks(go_version): - go_download_sdk( - name = "go_linux_amd64", - goos = "linux", - goarch = "amd64", - version = go_version, - ) - go_download_sdk( - name = "go_linux_arm64", - goos = "linux", - goarch = "arm64", - version = go_version, - ) - go_download_sdk( - name = "go_darwin_amd64", - goos = "darwin", - goarch = "amd64", - version = go_version, - ) - go_download_sdk( - name = "go_darwin_arm64", - goos = "darwin", - goarch = "arm64", - version = go_version, - ) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 6d2cf2014c..a8375bcdef 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -196,9 +196,6 @@ def _go_deps(skip_targets): if "io_bazel_rules_go" not in skip_targets: external_http_archive( name = "io_bazel_rules_go", - # TODO(wrowe, sunjayBhatia): remove when Windows RBE supports batch file invocation - patch_args = ["-p1"], - patches = ["@envoy//bazel:rules_go.patch"], ) external_http_archive("bazel_gazelle") -- 2.40.0