Loading pkgs/servers/http/envoy/0001-nixpkgs-use-system-Python.patch +19 −15 Original line number Diff line number Diff line From 4a9739da420b9584d5b9582c19cf3f86a6a90609 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown <git@lukegb.com> Date: Fri, 12 May 2023 08:12:04 +0100 Subject: [PATCH 1/3] nixpkgs: use system Python From 418d38868d63c0009460e1a3ca004987fe26346b 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 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- bazel/python_dependencies.bzl | 11 ++++------- bazel/repositories_extra.bzl | 16 ---------------- 2 files changed, 4 insertions(+), 23 deletions(-) bazel/repositories_extra.bzl | 17 +---------------- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/bazel/python_dependencies.bzl b/bazel/python_dependencies.bzl index ea50bf30ba..b82f374720 100644 index b747fd0b9a..b82f374720 100644 --- a/bazel/python_dependencies.bzl +++ b/bazel/python_dependencies.bzl @@ -1,27 +1,24 @@ load("@rules_python//python:pip.bzl", "pip_parse") -load("@python3_11//:defs.bzl", "interpreter") -load("@envoy_toolshed//:packages.bzl", "load_packages") -load("@python3_11//:defs.bzl", "interpreter") load("@rules_python//python:pip.bzl", "pip_parse") def envoy_python_dependencies(): - # TODO(phlax): rename base_pip3 -> pip3 and remove this Loading Loading @@ -45,15 +46,16 @@ index ea50bf30ba..b82f374720 100644 extra_pip_args = ["--require-hashes"], ) diff --git a/bazel/repositories_extra.bzl b/bazel/repositories_extra.bzl index 40d348073f..17b98b1ea1 100644 index a5bc2d5277..001de36a16 100644 --- a/bazel/repositories_extra.bzl +++ b/bazel/repositories_extra.bzl @@ -1,29 +1,13 @@ @@ -2,19 +2,11 @@ load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies") load("@com_github_rules_proto_grpc//:repositories.bzl", "rules_proto_grpc_toolchains") load("@emsdk//:deps.bzl", emsdk_deps = "deps") -load("@rules_python//python:repositories.bzl", "python_register_toolchains") load("@proxy_wasm_cpp_host//bazel/cargo/wasmtime:crates.bzl", "wasmtime_fetch_remote_crates") -load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains") +load("@rules_python//python:repositories.bzl", "py_repositories") load("//bazel/external/cargo:crates.bzl", "raze_fetch_remote_crates") load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies") -def _python_minor_version(python_version): - return "_".join(python_version.split(".")[:-1]) Loading @@ -68,7 +70,9 @@ index 40d348073f..17b98b1ea1 100644 ignore_root_user_error = False): emsdk_deps() raze_fetch_remote_crates() wasmtime_fetch_remote_crates() @@ -22,11 +14,4 @@ def envoy_dependencies_extra( rules_proto_grpc_toolchains() py_repositories() - # Registers underscored Python minor version - eg `python3_10` - python_register_toolchains( Loading @@ -79,5 +83,5 @@ index 40d348073f..17b98b1ea1 100644 - aspect_bazel_lib_dependencies() -- 2.42.0 2.44.0 pkgs/servers/http/envoy/0002-nixpkgs-use-system-Go.patch +16 −53 Original line number Diff line number Diff line From 10e577a3c300f76ead5a5512f2fe970f12e46592 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown <git@lukegb.com> Date: Fri, 12 May 2023 08:13:21 +0100 Subject: [PATCH 2/3] nixpkgs: use system Go From 0ecb8b5bc194fecb10c523d5856dc0b4cb78f6e4 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 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- bazel/dependency_imports.bzl | 29 +---------------------------- bazel/dependency_imports.bzl | 2 +- bazel/repositories.bzl | 3 --- 2 files changed, 1 insertion(+), 31 deletions(-) 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl index b743a1936d..afa04ef5c0 100644 index 0e29abb8d0..df19c84755 100644 --- a/bazel/dependency_imports.bzl +++ b/bazel/dependency_imports.bzl @@ -18,7 +18,7 @@ load("@com_google_cel_cpp//bazel:deps.bzl", "parser_deps") load("@com_github_chrusty_protoc_gen_jsonschema//:deps.bzl", protoc_gen_jsonschema_go_dependencies = "go_dependencies") @@ -19,7 +19,7 @@ load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_regi load("@upb//bazel:workspace_deps.bzl", "upb_deps") # go version for rules_go -GO_VERSION = "1.18" -GO_VERSION = "1.20" +GO_VERSION = "host" JQ_VERSION = "1.6" JQ_VERSION = "1.7" YQ_VERSION = "4.24.4" @@ -27,7 +27,6 @@ def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, y rules_foreign_cc_dependencies() go_rules_dependencies() go_register_toolchains(go_version) - envoy_download_go_sdks(go_version) gazelle_dependencies(go_sdk = "go_sdk") apple_rules_dependencies() pip_dependencies() @@ -148,29 +147,3 @@ def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, y ) protoc_gen_jsonschema_go_dependencies() - -def envoy_download_go_sdks(go_version): - go_download_sdk( - name = "go_linux_amd64", - goos = "linux", - goarch = "amd64", - version = go_version, - ) - go_download_sdk( - name = "go_linux_arm64", - goos = "linux", - goarch = "arm64", - version = go_version, - ) - go_download_sdk( - name = "go_darwin_amd64", - goos = "darwin", - goarch = "amd64", - version = go_version, - ) - go_download_sdk( - name = "go_darwin_arm64", - goos = "darwin", - goarch = "arm64", - version = go_version, - ) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 71667227f7..b10a47d344 100644 index d91aa712bd..6623972286 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -215,9 +215,6 @@ def _go_deps(skip_targets): @@ -246,9 +246,6 @@ def _go_deps(skip_targets): if "io_bazel_rules_go" not in skip_targets: external_http_archive( name = "io_bazel_rules_go", Loading @@ -74,5 +37,5 @@ index 71667227f7..b10a47d344 100644 external_http_archive("bazel_gazelle") -- 2.42.0 2.44.0 pkgs/servers/http/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch +11 −10 Original line number Diff line number Diff line From 6175deb13a2df8bd25a56021ba8754e4be445219 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown <git@lukegb.com> Date: Fri, 13 Oct 2023 21:42:51 +0000 Subject: [PATCH 3/3] nixpkgs: use system C/C++ toolchains From d2fbc618ea040360e08b3c462bcdf0f8f44dd434 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 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- bazel/dependency_imports.bzl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl index afa04ef5c0..a5ffaf4ff3 100644 index df19c84755..9732a5d646 100644 --- a/bazel/dependency_imports.bzl +++ b/bazel/dependency_imports.bzl @@ -24,7 +24,11 @@ JQ_VERSION = "1.6" @@ -25,7 +25,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): Loading @@ -23,7 +24,7 @@ index afa04ef5c0..a5ffaf4ff3 100644 + ) go_rules_dependencies() go_register_toolchains(go_version) gazelle_dependencies(go_sdk = "go_sdk") if go_version != "host": -- 2.42.0 2.44.0 pkgs/servers/http/envoy/0004-nixpkgs-add-cstdint-in-dd-trace-cpp.patch 0 → 100644 +29 −0 Original line number Diff line number Diff line 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 0 → 100644 +25 −0 Original line number Diff line number Diff line 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 Loading
pkgs/servers/http/envoy/0001-nixpkgs-use-system-Python.patch +19 −15 Original line number Diff line number Diff line From 4a9739da420b9584d5b9582c19cf3f86a6a90609 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown <git@lukegb.com> Date: Fri, 12 May 2023 08:12:04 +0100 Subject: [PATCH 1/3] nixpkgs: use system Python From 418d38868d63c0009460e1a3ca004987fe26346b 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 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- bazel/python_dependencies.bzl | 11 ++++------- bazel/repositories_extra.bzl | 16 ---------------- 2 files changed, 4 insertions(+), 23 deletions(-) bazel/repositories_extra.bzl | 17 +---------------- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/bazel/python_dependencies.bzl b/bazel/python_dependencies.bzl index ea50bf30ba..b82f374720 100644 index b747fd0b9a..b82f374720 100644 --- a/bazel/python_dependencies.bzl +++ b/bazel/python_dependencies.bzl @@ -1,27 +1,24 @@ load("@rules_python//python:pip.bzl", "pip_parse") -load("@python3_11//:defs.bzl", "interpreter") -load("@envoy_toolshed//:packages.bzl", "load_packages") -load("@python3_11//:defs.bzl", "interpreter") load("@rules_python//python:pip.bzl", "pip_parse") def envoy_python_dependencies(): - # TODO(phlax): rename base_pip3 -> pip3 and remove this Loading Loading @@ -45,15 +46,16 @@ index ea50bf30ba..b82f374720 100644 extra_pip_args = ["--require-hashes"], ) diff --git a/bazel/repositories_extra.bzl b/bazel/repositories_extra.bzl index 40d348073f..17b98b1ea1 100644 index a5bc2d5277..001de36a16 100644 --- a/bazel/repositories_extra.bzl +++ b/bazel/repositories_extra.bzl @@ -1,29 +1,13 @@ @@ -2,19 +2,11 @@ load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies") load("@com_github_rules_proto_grpc//:repositories.bzl", "rules_proto_grpc_toolchains") load("@emsdk//:deps.bzl", emsdk_deps = "deps") -load("@rules_python//python:repositories.bzl", "python_register_toolchains") load("@proxy_wasm_cpp_host//bazel/cargo/wasmtime:crates.bzl", "wasmtime_fetch_remote_crates") -load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains") +load("@rules_python//python:repositories.bzl", "py_repositories") load("//bazel/external/cargo:crates.bzl", "raze_fetch_remote_crates") load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies") -def _python_minor_version(python_version): - return "_".join(python_version.split(".")[:-1]) Loading @@ -68,7 +70,9 @@ index 40d348073f..17b98b1ea1 100644 ignore_root_user_error = False): emsdk_deps() raze_fetch_remote_crates() wasmtime_fetch_remote_crates() @@ -22,11 +14,4 @@ def envoy_dependencies_extra( rules_proto_grpc_toolchains() py_repositories() - # Registers underscored Python minor version - eg `python3_10` - python_register_toolchains( Loading @@ -79,5 +83,5 @@ index 40d348073f..17b98b1ea1 100644 - aspect_bazel_lib_dependencies() -- 2.42.0 2.44.0
pkgs/servers/http/envoy/0002-nixpkgs-use-system-Go.patch +16 −53 Original line number Diff line number Diff line From 10e577a3c300f76ead5a5512f2fe970f12e46592 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown <git@lukegb.com> Date: Fri, 12 May 2023 08:13:21 +0100 Subject: [PATCH 2/3] nixpkgs: use system Go From 0ecb8b5bc194fecb10c523d5856dc0b4cb78f6e4 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 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- bazel/dependency_imports.bzl | 29 +---------------------------- bazel/dependency_imports.bzl | 2 +- bazel/repositories.bzl | 3 --- 2 files changed, 1 insertion(+), 31 deletions(-) 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl index b743a1936d..afa04ef5c0 100644 index 0e29abb8d0..df19c84755 100644 --- a/bazel/dependency_imports.bzl +++ b/bazel/dependency_imports.bzl @@ -18,7 +18,7 @@ load("@com_google_cel_cpp//bazel:deps.bzl", "parser_deps") load("@com_github_chrusty_protoc_gen_jsonschema//:deps.bzl", protoc_gen_jsonschema_go_dependencies = "go_dependencies") @@ -19,7 +19,7 @@ load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_regi load("@upb//bazel:workspace_deps.bzl", "upb_deps") # go version for rules_go -GO_VERSION = "1.18" -GO_VERSION = "1.20" +GO_VERSION = "host" JQ_VERSION = "1.6" JQ_VERSION = "1.7" YQ_VERSION = "4.24.4" @@ -27,7 +27,6 @@ def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, y rules_foreign_cc_dependencies() go_rules_dependencies() go_register_toolchains(go_version) - envoy_download_go_sdks(go_version) gazelle_dependencies(go_sdk = "go_sdk") apple_rules_dependencies() pip_dependencies() @@ -148,29 +147,3 @@ def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, y ) protoc_gen_jsonschema_go_dependencies() - -def envoy_download_go_sdks(go_version): - go_download_sdk( - name = "go_linux_amd64", - goos = "linux", - goarch = "amd64", - version = go_version, - ) - go_download_sdk( - name = "go_linux_arm64", - goos = "linux", - goarch = "arm64", - version = go_version, - ) - go_download_sdk( - name = "go_darwin_amd64", - goos = "darwin", - goarch = "amd64", - version = go_version, - ) - go_download_sdk( - name = "go_darwin_arm64", - goos = "darwin", - goarch = "arm64", - version = go_version, - ) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 71667227f7..b10a47d344 100644 index d91aa712bd..6623972286 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -215,9 +215,6 @@ def _go_deps(skip_targets): @@ -246,9 +246,6 @@ def _go_deps(skip_targets): if "io_bazel_rules_go" not in skip_targets: external_http_archive( name = "io_bazel_rules_go", Loading @@ -74,5 +37,5 @@ index 71667227f7..b10a47d344 100644 external_http_archive("bazel_gazelle") -- 2.42.0 2.44.0
pkgs/servers/http/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch +11 −10 Original line number Diff line number Diff line From 6175deb13a2df8bd25a56021ba8754e4be445219 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown <git@lukegb.com> Date: Fri, 13 Oct 2023 21:42:51 +0000 Subject: [PATCH 3/3] nixpkgs: use system C/C++ toolchains From d2fbc618ea040360e08b3c462bcdf0f8f44dd434 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 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- bazel/dependency_imports.bzl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl index afa04ef5c0..a5ffaf4ff3 100644 index df19c84755..9732a5d646 100644 --- a/bazel/dependency_imports.bzl +++ b/bazel/dependency_imports.bzl @@ -24,7 +24,11 @@ JQ_VERSION = "1.6" @@ -25,7 +25,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): Loading @@ -23,7 +24,7 @@ index afa04ef5c0..a5ffaf4ff3 100644 + ) go_rules_dependencies() go_register_toolchains(go_version) gazelle_dependencies(go_sdk = "go_sdk") if go_version != "host": -- 2.42.0 2.44.0
pkgs/servers/http/envoy/0004-nixpkgs-add-cstdint-in-dd-trace-cpp.patch 0 → 100644 +29 −0 Original line number Diff line number Diff line 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 0 → 100644 +25 −0 Original line number Diff line number Diff line 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
Paul Meyer <49727155+katexochen@users.noreply.github.com>