diff --git a/pkgs/servers/http/envoy/0001-nixpkgs-use-system-Python.patch b/pkgs/servers/http/envoy/0001-nixpkgs-use-system-Python.patch index 8d7d63445c06..9e58599e5943 100644 --- a/pkgs/servers/http/envoy/0001-nixpkgs-use-system-Python.patch +++ b/pkgs/servers/http/envoy/0001-nixpkgs-use-system-Python.patch @@ -1,7 +1,7 @@ -From 418d38868d63c0009460e1a3ca004987fe26346b Mon Sep 17 00:00:00 2001 +From 07af89ac82e0c5876590f89284795bffa4b0e1c8 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Mon, 22 Apr 2024 11:52:59 +0200 -Subject: [PATCH 1/4] nixpkgs: use system Python +Subject: [PATCH 1/3] nixpkgs: use system Python Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- @@ -10,10 +10,11 @@ Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/bazel/python_dependencies.bzl b/bazel/python_dependencies.bzl -index b747fd0b9a..b82f374720 100644 +index b015e851c0..53a2c93c59 100644 --- a/bazel/python_dependencies.bzl +++ b/bazel/python_dependencies.bzl -@@ -1,27 +1,24 @@ +@@ -1,28 +1,25 @@ + load("@com_google_protobuf//bazel:system_python.bzl", "system_python") -load("@envoy_toolshed//:packages.bzl", "load_packages") -load("@python3_11//:defs.bzl", "interpreter") load("@rules_python//python:pip.bzl", "pip_parse") @@ -46,7 +47,7 @@ index b747fd0b9a..b82f374720 100644 extra_pip_args = ["--require-hashes"], ) diff --git a/bazel/repositories_extra.bzl b/bazel/repositories_extra.bzl -index a5bc2d5277..001de36a16 100644 +index 7fd1dc4095..001de36a16 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") @@ -61,7 +62,7 @@ index a5bc2d5277..001de36a16 100644 - return "_".join(python_version.split(".")[:-1]) - -# Python version for `rules_python` --PYTHON_VERSION = "3.11.3" +-PYTHON_VERSION = "3.11.9" -PYTHON_MINOR_VERSION = _python_minor_version(PYTHON_VERSION) - # Envoy deps that rely on a first stage of dependency loading in envoy_dependencies(). @@ -83,5 +84,5 @@ index a5bc2d5277..001de36a16 100644 - aspect_bazel_lib_dependencies() -- -2.44.0 +2.45.1 diff --git a/pkgs/servers/http/envoy/0002-nixpkgs-use-system-Go.patch b/pkgs/servers/http/envoy/0002-nixpkgs-use-system-Go.patch index b58bbdedf51a..bc48b48f7302 100644 --- a/pkgs/servers/http/envoy/0002-nixpkgs-use-system-Go.patch +++ b/pkgs/servers/http/envoy/0002-nixpkgs-use-system-Go.patch @@ -1,7 +1,7 @@ -From 0ecb8b5bc194fecb10c523d5856dc0b4cb78f6e4 Mon Sep 17 00:00:00 2001 +From 06b51e6a0c14e5ad7cfc1dc801561e6e6e1b2014 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Mon, 22 Apr 2024 11:58:00 +0200 -Subject: [PATCH 2/4] nixpkgs: use system Go +Subject: [PATCH 2/3] nixpkgs: use system Go Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- @@ -10,11 +10,11 @@ Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl -index 0e29abb8d0..df19c84755 100644 +index 1bf6c54a25..4e55a129e4 100644 --- a/bazel/dependency_imports.bzl +++ b/bazel/dependency_imports.bzl -@@ -19,7 +19,7 @@ load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_regi - load("@upb//bazel:workspace_deps.bzl", "upb_deps") +@@ -18,7 +18,7 @@ load("@rules_rust//rust:defs.bzl", "rust_common") + load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains", "rust_repository_set") # go version for rules_go -GO_VERSION = "1.20" @@ -23,7 +23,7 @@ index 0e29abb8d0..df19c84755 100644 JQ_VERSION = "1.7" YQ_VERSION = "4.24.4" diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl -index d91aa712bd..6623972286 100644 +index 02f7abd725..aad9adac24 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -246,9 +246,6 @@ def _go_deps(skip_targets): @@ -37,5 +37,5 @@ index d91aa712bd..6623972286 100644 external_http_archive("bazel_gazelle") -- -2.44.0 +2.45.1 diff --git a/pkgs/servers/http/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch b/pkgs/servers/http/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch index 1e5a792f55a8..ca304f1d817a 100644 --- a/pkgs/servers/http/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch +++ b/pkgs/servers/http/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch @@ -1,7 +1,7 @@ -From d2fbc618ea040360e08b3c462bcdf0f8f44dd434 Mon Sep 17 00:00:00 2001 +From 1213bbf5583c6615f719e0acf5f568e08bca5b35 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Mon, 22 Apr 2024 11:59:22 +0200 -Subject: [PATCH 3/4] nixpkgs: use system C/C++ toolchains +Subject: [PATCH 3/3] nixpkgs: use system C/C++ toolchains Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- @@ -9,10 +9,10 @@ Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl -index df19c84755..9732a5d646 100644 +index 4e55a129e4..6c2a5f0d82 100644 --- a/bazel/dependency_imports.bzl +++ b/bazel/dependency_imports.bzl -@@ -25,7 +25,11 @@ JQ_VERSION = "1.7" +@@ -24,7 +24,11 @@ JQ_VERSION = "1.7" YQ_VERSION = "4.24.4" def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, yq_version = YQ_VERSION): @@ -26,5 +26,5 @@ index df19c84755..9732a5d646 100644 go_register_toolchains(go_version) if go_version != "host": -- -2.44.0 +2.45.1 diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index b33eb921ef36..5656daafa43e 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -24,15 +24,15 @@ let # However, the version string is more useful for end-users. # These are contained in a attrset of their own to make it obvious that # people should update both. - version = "1.30.4"; - rev = "32113313a357829ba3a5dce0795b6780bf8cbf4d"; - hash = "sha256-u9lTVe40pwXTt0YRwJXRuZonS5KJL2JQUQ3L9ymuA74="; + version = "1.31.0"; + rev = "7b8baff1758f0a584dcc3cb657b5032000bcb3d7"; + hash = "sha256-pKERyXABcpMpKMRRvqJavp2jYGXTxwFLDPERqDT6jnY="; }; # these need to be updated for any changes to fetchAttrs depsHash = { - x86_64-linux = "sha256-m7dMr/dCmjpKLPT+8FXBHGkTlNoN9x1oQ7D6uO0sHtQ="; - aarch64-linux = "sha256-9GqVpWkMHP9nb5EZHjGKixkWazi//oLlIUum45xTvoM="; + x86_64-linux = "sha256-33yu2oxP2zgKs01qn6RIyZx6zHJ1NuCNxolgk0/uWpM="; + aarch64-linux = "sha256-ox7CJPqNbwucMDORQvx8SFs4oXR/WKixwJ6uK+l4NJc="; }.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); in buildBazelPackage {