-
-
Notifications
You must be signed in to change notification settings - Fork 14.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
6 changed files
with
59 additions
and
317 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,18 +5,15 @@ Subject: [PATCH] nixpkgs: use system Python | |
|
||
Signed-off-by: Paul Meyer <[email protected]> | ||
--- | ||
bazel/python_dependencies.bzl | 11 ++++------- | ||
bazel/python_dependencies.bzl | 9 ++++----- | ||
bazel/repositories_extra.bzl | 17 +---------------- | ||
2 files changed, 5 insertions(+), 23 deletions(-) | ||
2 files changed, 5 insertions(+), 21 deletions(-) | ||
|
||
diff --git a/bazel/python_dependencies.bzl b/bazel/python_dependencies.bzl | ||
index 9f2b336b1a36ca0d2f04a40ac1809b30ff21df27..53a2c93c59492a12ef4a6ecfc0c8a679f0df73f7 100644 | ||
index 9867dc3a46dbe780eb3c02bad8f6a22a2c7fd97e..ff8685e0e437aee447218e912f1cf3e494755cf4 100644 | ||
--- a/bazel/python_dependencies.bzl | ||
+++ b/bazel/python_dependencies.bzl | ||
@@ -1,28 +1,25 @@ | ||
load("@com_google_protobuf//bazel:system_python.bzl", "system_python") | ||
-load("@envoy_toolshed//:packages.bzl", "load_packages") | ||
-load("@python3_12//:defs.bzl", "interpreter") | ||
@@ -3,25 +3,24 @@ load("@envoy_toolshed//:packages.bzl", "load_packages") | ||
load("@rules_python//python:pip.bzl", "pip_parse") | ||
|
||
def envoy_python_dependencies(): | ||
|
@@ -28,30 +25,30 @@ index 9f2b336b1a36ca0d2f04a40ac1809b30ff21df27..53a2c93c59492a12ef4a6ecfc0c8a679 | |
+ ) | ||
pip_parse( | ||
name = "base_pip3", | ||
- python_interpreter_target = interpreter, | ||
- python_interpreter_target = "@python3_12_host//:python", | ||
requirements_lock = "@envoy//tools/base:requirements.txt", | ||
extra_pip_args = ["--require-hashes"], | ||
) | ||
|
||
pip_parse( | ||
name = "dev_pip3", | ||
- python_interpreter_target = interpreter, | ||
- python_interpreter_target = "@python3_12_host//:python", | ||
requirements_lock = "@envoy//tools/dev:requirements.txt", | ||
extra_pip_args = ["--require-hashes"], | ||
) | ||
|
||
pip_parse( | ||
name = "fuzzing_pip3", | ||
- python_interpreter_target = interpreter, | ||
- python_interpreter_target = "@python3_12_host//:python", | ||
requirements_lock = "@rules_fuzzing//fuzzing:requirements.txt", | ||
extra_pip_args = ["--require-hashes"], | ||
) | ||
diff --git a/bazel/repositories_extra.bzl b/bazel/repositories_extra.bzl | ||
index b92dd461ba7037d2f1c079f283ff2c466686f7a4..cef32b3140588cb7668d47d0c08528f131184fe4 100644 | ||
index 7a9d3bbb53b567a8f398abaefe5ff044056d4d21..a5b75718de667883824e4320e2d563830b02f5d2 100644 | ||
--- a/bazel/repositories_extra.bzl | ||
+++ b/bazel/repositories_extra.bzl | ||
@@ -2,19 +2,11 @@ load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies") | ||
load("@bazel_features//:deps.bzl", "bazel_features_deps") | ||
@@ -3,19 +3,11 @@ load("@bazel_features//:deps.bzl", "bazel_features_deps") | ||
load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_bazel_features") | ||
load("@emsdk//:deps.bzl", emsdk_deps = "deps") | ||
load("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:crates.bzl", "crate_repositories") | ||
-load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains") | ||
|
@@ -71,7 +68,7 @@ index b92dd461ba7037d2f1c079f283ff2c466686f7a4..cef32b3140588cb7668d47d0c08528f1 | |
ignore_root_user_error = False): | ||
bazel_features_deps() | ||
emsdk_deps() | ||
@@ -22,11 +14,4 @@ def envoy_dependencies_extra( | ||
@@ -23,13 +15,6 @@ def envoy_dependencies_extra( | ||
crate_repositories() | ||
py_repositories() | ||
|
||
|
@@ -83,3 +80,5 @@ index b92dd461ba7037d2f1c079f283ff2c466686f7a4..cef32b3140588cb7668d47d0c08528f1 | |
- ) | ||
- | ||
aspect_bazel_lib_dependencies() | ||
|
||
if not native.existing_rule("proto_bazel_features"): |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
128 changes: 0 additions & 128 deletions
128
pkgs/by-name/en/envoy/0005-deps-Bump-rules_rust-0.54.1-37056.patch
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.