Skip to content

Commit

Permalink
envoy: 1.32.3 -> 1.33.0 (#374003)
Browse files Browse the repository at this point in the history
  • Loading branch information
katexochen authored Jan 17, 2025
2 parents 3f0dca1 + 3fcfdc9 commit 041c867
Show file tree
Hide file tree
Showing 6 changed files with 59 additions and 317 deletions.
27 changes: 13 additions & 14 deletions pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand All @@ -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")
Expand All @@ -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()

Expand All @@ -83,3 +80,5 @@ index b92dd461ba7037d2f1c079f283ff2c466686f7a4..cef32b3140588cb7668d47d0c08528f1
- )
-
aspect_bazel_lib_dependencies()

if not native.existing_rule("proto_bazel_features"):
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ index 0000000000000000000000000000000000000000..8dcad4cc11f691eec93efa29075c1d35
+ // FIPS functions.
+
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index 5cb573770f0aeac7b42d803673c8c520b5e35131..e864ef24db4bf837ef50d90c8eca316eba939d74 100644
index cd15ec36f45f5958f4e65d314af78a0ef7c5dc78..935bf8a1ced67c094e4e900ba84bf39033bd3bbb 100644
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
@@ -264,6 +264,7 @@ def _boringssl():
@@ -263,6 +263,7 @@ def _boringssl():
patch_args = ["-p1"],
patches = [
"@envoy//bazel:boringssl_static.patch",
Expand Down
128 changes: 0 additions & 128 deletions pkgs/by-name/en/envoy/0005-deps-Bump-rules_rust-0.54.1-37056.patch

This file was deleted.

127 changes: 0 additions & 127 deletions pkgs/by-name/en/envoy/0006-gcc-warnings.patch

This file was deleted.

19 changes: 0 additions & 19 deletions pkgs/by-name/en/envoy/0007-protobuf-remove-Werror.patch

This file was deleted.

Loading

0 comments on commit 041c867

Please sign in to comment.