Skip to content

Commit 041c867

Browse files
authored
envoy: 1.32.3 -> 1.33.0 (NixOS#374003)
2 parents 3f0dca1 + 3fcfdc9 commit 041c867

File tree

6 files changed

+59
-317
lines changed

6 files changed

+59
-317
lines changed

pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,15 @@ Subject: [PATCH] nixpkgs: use system Python
55

66
Signed-off-by: Paul Meyer <[email protected]>
77
---
8-
bazel/python_dependencies.bzl | 11 ++++-------
8+
bazel/python_dependencies.bzl | 9 ++++-----
99
bazel/repositories_extra.bzl | 17 +----------------
10-
2 files changed, 5 insertions(+), 23 deletions(-)
10+
2 files changed, 5 insertions(+), 21 deletions(-)
1111

1212
diff --git a/bazel/python_dependencies.bzl b/bazel/python_dependencies.bzl
13-
index 9f2b336b1a36ca0d2f04a40ac1809b30ff21df27..53a2c93c59492a12ef4a6ecfc0c8a679f0df73f7 100644
13+
index 9867dc3a46dbe780eb3c02bad8f6a22a2c7fd97e..ff8685e0e437aee447218e912f1cf3e494755cf4 100644
1414
--- a/bazel/python_dependencies.bzl
1515
+++ 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_12//:defs.bzl", "interpreter")
16+
@@ -3,25 +3,24 @@ load("@envoy_toolshed//:packages.bzl", "load_packages")
2017
load("@rules_python//python:pip.bzl", "pip_parse")
2118

2219
def envoy_python_dependencies():
@@ -28,30 +25,30 @@ index 9f2b336b1a36ca0d2f04a40ac1809b30ff21df27..53a2c93c59492a12ef4a6ecfc0c8a679
2825
+ )
2926
pip_parse(
3027
name = "base_pip3",
31-
- python_interpreter_target = interpreter,
28+
- python_interpreter_target = "@python3_12_host//:python",
3229
requirements_lock = "@envoy//tools/base:requirements.txt",
3330
extra_pip_args = ["--require-hashes"],
3431
)
3532

3633
pip_parse(
3734
name = "dev_pip3",
38-
- python_interpreter_target = interpreter,
35+
- python_interpreter_target = "@python3_12_host//:python",
3936
requirements_lock = "@envoy//tools/dev:requirements.txt",
4037
extra_pip_args = ["--require-hashes"],
4138
)
4239

4340
pip_parse(
4441
name = "fuzzing_pip3",
45-
- python_interpreter_target = interpreter,
42+
- python_interpreter_target = "@python3_12_host//:python",
4643
requirements_lock = "@rules_fuzzing//fuzzing:requirements.txt",
4744
extra_pip_args = ["--require-hashes"],
4845
)
4946
diff --git a/bazel/repositories_extra.bzl b/bazel/repositories_extra.bzl
50-
index b92dd461ba7037d2f1c079f283ff2c466686f7a4..cef32b3140588cb7668d47d0c08528f131184fe4 100644
47+
index 7a9d3bbb53b567a8f398abaefe5ff044056d4d21..a5b75718de667883824e4320e2d563830b02f5d2 100644
5148
--- a/bazel/repositories_extra.bzl
5249
+++ b/bazel/repositories_extra.bzl
53-
@@ -2,19 +2,11 @@ load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies")
54-
load("@bazel_features//:deps.bzl", "bazel_features_deps")
50+
@@ -3,19 +3,11 @@ load("@bazel_features//:deps.bzl", "bazel_features_deps")
51+
load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_bazel_features")
5552
load("@emsdk//:deps.bzl", emsdk_deps = "deps")
5653
load("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:crates.bzl", "crate_repositories")
5754
-load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")
@@ -71,7 +68,7 @@ index b92dd461ba7037d2f1c079f283ff2c466686f7a4..cef32b3140588cb7668d47d0c08528f1
7168
ignore_root_user_error = False):
7269
bazel_features_deps()
7370
emsdk_deps()
74-
@@ -22,11 +14,4 @@ def envoy_dependencies_extra(
71+
@@ -23,13 +15,6 @@ def envoy_dependencies_extra(
7572
crate_repositories()
7673
py_repositories()
7774

@@ -83,3 +80,5 @@ index b92dd461ba7037d2f1c079f283ff2c466686f7a4..cef32b3140588cb7668d47d0c08528f1
8380
- )
8481
-
8582
aspect_bazel_lib_dependencies()
83+
84+
if not native.existing_rule("proto_bazel_features"):

pkgs/by-name/en/envoy/0004-nixpkgs-patch-boringssl-for-gcc14.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ index 0000000000000000000000000000000000000000..8dcad4cc11f691eec93efa29075c1d35
4242
+ // FIPS functions.
4343
+
4444
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
45-
index 5cb573770f0aeac7b42d803673c8c520b5e35131..e864ef24db4bf837ef50d90c8eca316eba939d74 100644
45+
index cd15ec36f45f5958f4e65d314af78a0ef7c5dc78..935bf8a1ced67c094e4e900ba84bf39033bd3bbb 100644
4646
--- a/bazel/repositories.bzl
4747
+++ b/bazel/repositories.bzl
48-
@@ -264,6 +264,7 @@ def _boringssl():
48+
@@ -263,6 +263,7 @@ def _boringssl():
4949
patch_args = ["-p1"],
5050
patches = [
5151
"@envoy//bazel:boringssl_static.patch",

pkgs/by-name/en/envoy/0005-deps-Bump-rules_rust-0.54.1-37056.patch

Lines changed: 0 additions & 128 deletions
This file was deleted.

pkgs/by-name/en/envoy/0006-gcc-warnings.patch

Lines changed: 0 additions & 127 deletions
This file was deleted.

pkgs/by-name/en/envoy/0007-protobuf-remove-Werror.patch

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)