envoy: 1.30.2 -> 1.30.3

Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
(cherry picked from commit 8809946c78)

pkgs/servers/http/envoy/0004-nixpkgs-add-cstdint-in-dd-trace-cpp.patch

@@ -1,29 +0,0 @@
-From dd3509a7d646a970480f94a8e09f377e9783504d Mon Sep 17 00:00:00 2001
-From: Malte Poll <1780588+malt3@users.noreply.github.com>
-Date: Mon, 22 Apr 2024 16:07:58 +0200
-Subject: [PATCH 4/4] nixpkgs: add cstdint in dd-trace-cpp
-
----
- bazel/repositories.bzl | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
-index d91aa712bd..467348e773 100644
---- a/bazel/repositories.bzl
-+++ b/bazel/repositories.bzl
-@@ -772,7 +772,11 @@ def _io_opentelemetry_api_cpp():
-     )
- 
- def _com_github_datadog_dd_trace_cpp():
--    external_http_archive("com_github_datadog_dd_trace_cpp")
-+    external_http_archive(
-+    	name = "com_github_datadog_dd_trace_cpp",
-+	patch_args = ["-p1"],
-+	patches = ["@envoy//bazel:dd_trace_cpp.patch"],
-+    )
-     native.bind(
-         name = "dd_trace_cpp",
-         actual = "@com_github_datadog_dd_trace_cpp//:dd_trace_cpp",
--- 
-2.42.0
-

pkgs/servers/http/envoy/dd_trace_cpp.patch

@@ -1,25 +0,0 @@
-From 4851a6a722b228ecbfd9df255dab3d8f30bd84b9 Mon Sep 17 00:00:00 2001
-From: Malte Poll <1780588+malt3@users.noreply.github.com>
-Date: Mon, 22 Apr 2024 15:36:33 +0200
-Subject: [PATCH] nixpkgs: add cstdint to fix compilation under GCC 13
-
-https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
----
- src/datadog/parse_util.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/datadog/parse_util.h b/src/datadog/parse_util.h
-index c603286..c8e4e83 100644
---- a/src/datadog/parse_util.h
-+++ b/src/datadog/parse_util.h
-@@ -2,6 +2,7 @@
- 
- // This component provides parsing-related miscellanea.
- 
-+#include <cstdint>
- #include <string>
- #include <unordered_map>
- #include <vector>
--- 
-2.42.0
-

pkgs/servers/http/envoy/default.nix

@@ -25,15 +25,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.2";
-    rev = "d79f6e8d453ee260e9094093b8dd31af0056e67b";
-    hash = "sha256-qbe9M4dH7NFDY5UF17urJ6WvnZNhvdMU4HAg0BaL+KA=";
+    version = "1.30.3";
+    rev = "12a6a79966203969a23aa2f0d705f39b679744c2";
+    hash = "sha256-S18bnAVha4CnYKHTzytKY6PHWSbOzmObbyZEhzIHsf8=";
   };
 
   # these need to be updated for any changes to fetchAttrs
   depsHash = {
-    x86_64-linux = "sha256-/IpTRFBkif1HSycPrWxphKTnhL6wHgPAweyxoXZ1oVg=";
-    aarch64-linux = "sha256-uA1CHKzdBht+WYxgwR2g5t7fRybhbo6Hgpzdr+H1vqY=";
+    x86_64-linux = "sha256-m7dMr/dCmjpKLPT+8FXBHGkTlNoN9x1oQ7D6uO0sHtQ=";
+    aarch64-linux = "sha256-9GqVpWkMHP9nb5EZHjGKixkWazi//oLlIUum45xTvoM=";
   }.${stdenv.system} or (throw "unsupported system ${stdenv.system}");
 in
 buildBazelPackage {
@@ -56,8 +56,6 @@ buildBazelPackage {
     sed -i 's,#!/usr/bin/env python3,#!${python3}/bin/python,' bazel/foreign_cc/luajit.patch
     sed -i '/javabase=/d' .bazelrc
     sed -i '/"-Werror"/d' bazel/envoy_internal.bzl
-
-    cp ${./dd_trace_cpp.patch} bazel/dd_trace_cpp.patch
   '';
 
   patches = [
@@ -69,11 +67,6 @@ buildBazelPackage {
 
     # use system C/C++ tools
     ./0003-nixpkgs-use-system-C-C-toolchains.patch
-
-    # apply patch to dd-trace-cpp
-    # remove once a version of dd-trace-cpp is released and adopted by envoy
-    # that contains https://github.com/DataDog/dd-trace-cpp/commit/3a8e1e9a3cf4e87ef053e954a39dc7a967ac6965
-    ./0004-nixpkgs-add-cstdint-in-dd-trace-cpp.patch
   ];
 
   nativeBuildInputs = [