pyrox.dev
1From 4a9739da420b9584d5b9582c19cf3f86a6a90609 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/3] nixpkgs: use system Python
5
6---
7 bazel/python_dependencies.bzl | 11 ++++-------
8 bazel/repositories_extra.bzl | 16 ----------------
9 2 files changed, 4 insertions(+), 23 deletions(-)
10
11diff --git a/bazel/python_dependencies.bzl b/bazel/python_dependencies.bzl
12index ea50bf30ba..b82f374720 100644
13--- a/bazel/python_dependencies.bzl
14+++ b/bazel/python_dependencies.bzl
15@@ -1,27 +1,24 @@
16 load("@rules_python//python:pip.bzl", "pip_parse")
17-load("@python3_11//:defs.bzl", "interpreter")
18-load("@envoy_toolshed//:packages.bzl", "load_packages")
19
20 def envoy_python_dependencies():
21- # TODO(phlax): rename base_pip3 -> pip3 and remove this
22- load_packages()
23+ pip_parse(
24+ name = "pip3",
25+ requirements_lock = "@envoy_toolshed//:requirements.txt",
26+ )
27 pip_parse(
28 name = "base_pip3",
29- python_interpreter_target = interpreter,
30 requirements_lock = "@envoy//tools/base:requirements.txt",
31 extra_pip_args = ["--require-hashes"],
32 )
33
34 pip_parse(
35 name = "dev_pip3",
36- python_interpreter_target = interpreter,
37 requirements_lock = "@envoy//tools/dev:requirements.txt",
38 extra_pip_args = ["--require-hashes"],
39 )
40
41 pip_parse(
42 name = "fuzzing_pip3",
43- python_interpreter_target = interpreter,
44 requirements_lock = "@rules_fuzzing//fuzzing:requirements.txt",
45 extra_pip_args = ["--require-hashes"],
46 )
47diff --git a/bazel/repositories_extra.bzl b/bazel/repositories_extra.bzl
48index 40d348073f..17b98b1ea1 100644
49--- a/bazel/repositories_extra.bzl
50+++ b/bazel/repositories_extra.bzl
51@@ -1,29 +1,13 @@
52 load("@emsdk//:deps.bzl", emsdk_deps = "deps")
53-load("@rules_python//python:repositories.bzl", "python_register_toolchains")
54 load("@proxy_wasm_cpp_host//bazel/cargo/wasmtime:crates.bzl", "wasmtime_fetch_remote_crates")
55 load("//bazel/external/cargo:crates.bzl", "raze_fetch_remote_crates")
56 load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies")
57
58-def _python_minor_version(python_version):
59- return "_".join(python_version.split(".")[:-1])
60-
61-# Python version for `rules_python`
62-PYTHON_VERSION = "3.11.3"
63-PYTHON_MINOR_VERSION = _python_minor_version(PYTHON_VERSION)
64-
65 # Envoy deps that rely on a first stage of dependency loading in envoy_dependencies().
66 def envoy_dependencies_extra(
67- python_version = PYTHON_VERSION,
68 ignore_root_user_error = False):
69 emsdk_deps()
70 raze_fetch_remote_crates()
71 wasmtime_fetch_remote_crates()
72
73- # Registers underscored Python minor version - eg `python3_10`
74- python_register_toolchains(
75- name = "python%s" % _python_minor_version(python_version),
76- python_version = python_version,
77- ignore_root_user_error = ignore_root_user_error,
78- )
79-
80 aspect_bazel_lib_dependencies()
81--
822.42.0
83