depot/third_party/nixpkgs/pkgs/servers/http/envoy/0002-nixpkgs-use-system-Go.patch

42 lines
1.5 KiB
Diff
Raw Normal View History

From 06b51e6a0c14e5ad7cfc1dc801561e6e6e1b2014 Mon Sep 17 00:00:00 2001
2024-04-26 17:01:46 +00:00
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Mon, 22 Apr 2024 11:58:00 +0200
Subject: [PATCH 2/3] nixpkgs: use system Go
2023-02-19 20:43:05 +00:00
2024-04-26 17:01:46 +00:00
Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
2023-02-19 20:43:05 +00:00
---
2024-04-26 17:01:46 +00:00
bazel/dependency_imports.bzl | 2 +-
bazel/repositories.bzl | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
2023-02-19 20:43:05 +00:00
diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl
index 1bf6c54a25..4e55a129e4 100644
2023-02-19 20:43:05 +00:00
--- a/bazel/dependency_imports.bzl
+++ b/bazel/dependency_imports.bzl
@@ -18,7 +18,7 @@ load("@rules_rust//rust:defs.bzl", "rust_common")
load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains", "rust_repository_set")
2023-02-19 20:43:05 +00:00
# go version for rules_go
2024-04-26 17:01:46 +00:00
-GO_VERSION = "1.20"
2023-02-19 20:43:05 +00:00
+GO_VERSION = "host"
2024-04-26 17:01:46 +00:00
JQ_VERSION = "1.7"
2023-02-19 20:43:05 +00:00
YQ_VERSION = "4.24.4"
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index 02f7abd725..aad9adac24 100644
2023-02-19 20:43:05 +00:00
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
2024-04-26 17:01:46 +00:00
@@ -246,9 +246,6 @@ def _go_deps(skip_targets):
2023-02-19 20:43:05 +00:00
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.45.1
2023-02-19 20:43:05 +00:00