tjh.dev
1From 07af89ac82e0c5876590f89284795bffa4b0e1c8 Mon Sep 17 00:00:00 2001
2From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
3Date: Mon, 22 Apr 2024 11:52:59 +0200
4Subject: [PATCH 1/3] nixpkgs: use system Python
5
6Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
7---
8 bazel/python_dependencies.bzl | 11 ++++-------
9 bazel/repositories_extra.bzl | 17 +----------------
10 2 files changed, 5 insertions(+), 23 deletions(-)
11
12diff --git a/bazel/python_dependencies.bzl b/bazel/python_dependencies.bzl
13index b015e851c0..53a2c93c59 100644
14--- a/bazel/python_dependencies.bzl
15+++ b/bazel/python_dependencies.bzl
16@@ -1,28 +1,25 @@
17 load("@com_google_protobuf//bazel:system_python.bzl", "system_python")
18-load("@envoy_toolshed//:packages.bzl", "load_packages")
19-load("@python3_11//:defs.bzl", "interpreter")
20 load("@rules_python//python:pip.bzl", "pip_parse")
21
22 def envoy_python_dependencies():
23- # TODO(phlax): rename base_pip3 -> pip3 and remove this
24- load_packages()
25+ pip_parse(
26+ name = "pip3",
27+ requirements_lock = "@envoy_toolshed//:requirements.txt",
28+ )
29 pip_parse(
30 name = "base_pip3",
31- python_interpreter_target = interpreter,
32 requirements_lock = "@envoy//tools/base:requirements.txt",
33 extra_pip_args = ["--require-hashes"],
34 )
35
36 pip_parse(
37 name = "dev_pip3",
38- python_interpreter_target = interpreter,
39 requirements_lock = "@envoy//tools/dev:requirements.txt",
40 extra_pip_args = ["--require-hashes"],
41 )
42
43 pip_parse(
44 name = "fuzzing_pip3",
45- python_interpreter_target = interpreter,
46 requirements_lock = "@rules_fuzzing//fuzzing:requirements.txt",
47 extra_pip_args = ["--require-hashes"],
48 )
49diff --git a/bazel/repositories_extra.bzl b/bazel/repositories_extra.bzl
50index 7fd1dc4095..001de36a16 100644
51--- a/bazel/repositories_extra.bzl
52+++ b/bazel/repositories_extra.bzl
53@@ -2,19 +2,11 @@ load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies")
54 load("@com_github_rules_proto_grpc//:repositories.bzl", "rules_proto_grpc_toolchains")
55 load("@emsdk//:deps.bzl", emsdk_deps = "deps")
56 load("@proxy_wasm_cpp_host//bazel/cargo/wasmtime:crates.bzl", "wasmtime_fetch_remote_crates")
57-load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")
58+load("@rules_python//python:repositories.bzl", "py_repositories")
59 load("//bazel/external/cargo:crates.bzl", "raze_fetch_remote_crates")
60
61-def _python_minor_version(python_version):
62- return "_".join(python_version.split(".")[:-1])
63-
64-# Python version for `rules_python`
65-PYTHON_VERSION = "3.11.9"
66-PYTHON_MINOR_VERSION = _python_minor_version(PYTHON_VERSION)
67-
68 # Envoy deps that rely on a first stage of dependency loading in envoy_dependencies().
69 def envoy_dependencies_extra(
70- python_version = PYTHON_VERSION,
71 ignore_root_user_error = False):
72 emsdk_deps()
73 raze_fetch_remote_crates()
74@@ -22,11 +14,4 @@ def envoy_dependencies_extra(
75 rules_proto_grpc_toolchains()
76 py_repositories()
77
78- # Registers underscored Python minor version - eg `python3_10`
79- python_register_toolchains(
80- name = "python%s" % _python_minor_version(python_version),
81- python_version = python_version,
82- ignore_root_user_error = ignore_root_user_error,
83- )
84-
85 aspect_bazel_lib_dependencies()
86--
872.45.1
88