mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 08:23:09 +00:00
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
From 06b51e6a0c14e5ad7cfc1dc801561e6e6e1b2014 Mon Sep 17 00:00:00 2001
|
|
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
|
|
|
|
Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
|
|
---
|
|
bazel/dependency_imports.bzl | 2 +-
|
|
bazel/repositories.bzl | 3 ---
|
|
2 files changed, 1 insertion(+), 4 deletions(-)
|
|
|
|
diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl
|
|
index 1bf6c54a25..4e55a129e4 100644
|
|
--- 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")
|
|
|
|
# go version for rules_go
|
|
-GO_VERSION = "1.20"
|
|
+GO_VERSION = "host"
|
|
|
|
JQ_VERSION = "1.7"
|
|
YQ_VERSION = "4.24.4"
|
|
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
|
|
index 02f7abd725..aad9adac24 100644
|
|
--- a/bazel/repositories.bzl
|
|
+++ b/bazel/repositories.bzl
|
|
@@ -246,9 +246,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.45.1
|
|
|