pyrox.dev
lol
1From 0000000000000000000000000000000000000000 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] nixpkgs: use system Python
5
6Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
7Signed-off-by: Luke Granger-Brown <git@lukegb.com>
8---
9 bazel/python_dependencies.bzl | 9 ++++-----
10 bazel/repositories_extra.bzl | 17 +----------------
11 2 files changed, 5 insertions(+), 21 deletions(-)
12
13diff --git a/bazel/python_dependencies.bzl b/bazel/python_dependencies.bzl
14index 9867dc3a46dbe780eb3c02bad8f6a22a2c7fd97e..ff8685e0e437aee447218e912f1cf3e494755cf4 100644
15--- a/bazel/python_dependencies.bzl
16+++ b/bazel/python_dependencies.bzl
17@@ -3,25 +3,24 @@ load("@envoy_toolshed//:packages.bzl", "load_packages")
18 load("@rules_python//python:pip.bzl", "pip_parse")
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 = "@python3_12_host//:python",
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 = "@python3_12_host//:python",
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 = "@python3_12_host//:python",
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 84e2a69c092fa4c824401a52b2c39a49f83d0837..e5afd5743613ad5fdbf7b28a99b6d1b5902566ac 100644
49--- a/bazel/repositories_extra.bzl
50+++ b/bazel/repositories_extra.bzl
51@@ -4,19 +4,11 @@ load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_baze
52 load("@emsdk//:deps.bzl", emsdk_deps = "deps")
53 load("@envoy_examples//bazel:env.bzl", "envoy_examples_env")
54 load("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:crates.bzl", "crate_repositories")
55-load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")
56+load("@rules_python//python:repositories.bzl", "py_repositories")
57 load("//bazel/external/cargo:crates.bzl", "raze_fetch_remote_crates")
58
59-def _python_minor_version(python_version):
60- return "_".join(python_version.split(".")[:-1])
61-
62-# Python version for `rules_python`
63-PYTHON_VERSION = "3.12.3"
64-PYTHON_MINOR_VERSION = _python_minor_version(PYTHON_VERSION)
65-
66 # Envoy deps that rely on a first stage of dependency loading in envoy_dependencies().
67 def envoy_dependencies_extra(
68- python_version = PYTHON_VERSION,
69 ignore_root_user_error = False):
70 bazel_features_deps()
71 emsdk_deps()
72@@ -24,13 +16,6 @@ def envoy_dependencies_extra(
73 crate_repositories()
74 py_repositories()
75
76- # Registers underscored Python minor version - eg `python3_10`
77- python_register_toolchains(
78- name = "python%s" % _python_minor_version(python_version),
79- python_version = python_version,
80- ignore_root_user_error = ignore_root_user_error,
81- )
82-
83 aspect_bazel_lib_dependencies()
84
85 if not native.existing_rule("proto_bazel_features"):