tjh.dev
1From 1b6ad143c0f5f96c42f603bb93a72f788b88b622 Mon Sep 17 00:00:00 2001
2From: Luke Granger-Brown <git@lukegb.com>
3Date: Fri, 12 May 2023 08:12:04 +0100
4Subject: [PATCH 1/2] nixpkgs: use system Python
5
6---
7 bazel/python_dependencies.bzl | 4 ----
8 bazel/repositories_extra.bzl | 13 +------------
9 2 files changed, 1 insertion(+), 16 deletions(-)
10
11diff --git a/bazel/python_dependencies.bzl b/bazel/python_dependencies.bzl
12index 37c0183664..0bee5feb7e 100644
13--- a/bazel/python_dependencies.bzl
14+++ b/bazel/python_dependencies.bzl
15@@ -1,24 +1,20 @@
16 load("@rules_python//python:pip.bzl", "pip_parse")
17-load("@python3_10//:defs.bzl", "interpreter")
18
19 def envoy_python_dependencies():
20 pip_parse(
21 name = "base_pip3",
22- python_interpreter_target = interpreter,
23 requirements_lock = "@envoy//tools/base:requirements.txt",
24 extra_pip_args = ["--require-hashes"],
25 )
26
27 pip_parse(
28 name = "dev_pip3",
29- python_interpreter_target = interpreter,
30 requirements_lock = "@envoy//tools/dev:requirements.txt",
31 extra_pip_args = ["--require-hashes"],
32 )
33
34 pip_parse(
35 name = "fuzzing_pip3",
36- python_interpreter_target = interpreter,
37 requirements_lock = "@rules_fuzzing//fuzzing:requirements.txt",
38 extra_pip_args = ["--require-hashes"],
39 )
40diff --git a/bazel/repositories_extra.bzl b/bazel/repositories_extra.bzl
41index 9d1b31c5d6..ac5605eb30 100644
42--- a/bazel/repositories_extra.bzl
43+++ b/bazel/repositories_extra.bzl
44@@ -1,23 +1,12 @@
45 load("@emsdk//:deps.bzl", emsdk_deps = "deps")
46-load("@rules_python//python:repositories.bzl", "python_register_toolchains")
47 load("@proxy_wasm_cpp_host//bazel/cargo/wasmtime:crates.bzl", "wasmtime_fetch_remote_crates")
48 load("//bazel/external/cargo:crates.bzl", "raze_fetch_remote_crates")
49 load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies")
50
51-# Python version for `rules_python`
52-PYTHON_VERSION = "3.10.2"
53-
54 # Envoy deps that rely on a first stage of dependency loading in envoy_dependencies().
55-def envoy_dependencies_extra(python_version = PYTHON_VERSION):
56+def envoy_dependencies_extra():
57 emsdk_deps()
58 raze_fetch_remote_crates()
59 wasmtime_fetch_remote_crates()
60
61- # Registers underscored Python minor version - eg `python3_10`
62- python_register_toolchains(
63- name = "python%s" % ("_".join(python_version.split(".")[:-1])),
64- python_version = python_version,
65- ignore_root_user_error = True,
66- )
67-
68 aspect_bazel_lib_dependencies()
69--
702.40.0
71