Merge pull request #330634 from r-ryantm/auto-update/circumflex
[NixPkgs.git] / pkgs / servers / http / envoy / 0002-nixpkgs-use-system-Go.patch
blobbc48b48f730232ad63317680dd0a3db540a00196
1 From 06b51e6a0c14e5ad7cfc1dc801561e6e6e1b2014 Mon Sep 17 00:00:00 2001
2 From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
3 Date: Mon, 22 Apr 2024 11:58:00 +0200
4 Subject: [PATCH 2/3] nixpkgs: use system Go
6 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
7 ---
8 bazel/dependency_imports.bzl | 2 +-
9 bazel/repositories.bzl | 3 ---
10 2 files changed, 1 insertion(+), 4 deletions(-)
12 diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl
13 index 1bf6c54a25..4e55a129e4 100644
14 --- a/bazel/dependency_imports.bzl
15 +++ b/bazel/dependency_imports.bzl
16 @@ -18,7 +18,7 @@ load("@rules_rust//rust:defs.bzl", "rust_common")
17 load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains", "rust_repository_set")
19 # go version for rules_go
20 -GO_VERSION = "1.20"
21 +GO_VERSION = "host"
23 JQ_VERSION = "1.7"
24 YQ_VERSION = "4.24.4"
25 diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
26 index 02f7abd725..aad9adac24 100644
27 --- a/bazel/repositories.bzl
28 +++ b/bazel/repositories.bzl
29 @@ -246,9 +246,6 @@ def _go_deps(skip_targets):
30 if "io_bazel_rules_go" not in skip_targets:
31 external_http_archive(
32 name = "io_bazel_rules_go",
33 - # TODO(wrowe, sunjayBhatia): remove when Windows RBE supports batch file invocation
34 - patch_args = ["-p1"],
35 - patches = ["@envoy//bazel:rules_go.patch"],
37 external_http_archive("bazel_gazelle")
39 --
40 2.45.1