From c2580474920cfe3e67a10bfa5ffae106527b0155 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Feb 2024 11:50:32 +0000 Subject: [PATCH] chore(deps): Bump toxic from `2e0b85d` to `a1c969a` Bumps [toxic](https://github.com/TokTok/toxic) from `2e0b85d` to `a1c969a`. - [Release notes](https://github.com/TokTok/toxic/releases) - [Commits](https://github.com/TokTok/toxic/compare/2e0b85dda5d15d1f1f98fb659921109b2126291a...a1c969a78418b67eb2e999efd862d3d916844d1a) --- updated-dependencies: - dependency-name: toxic dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .bazelrc | 12 +- WORKSPACE | 110 +++++++++++------- c-toxcore | 2 +- dockerfiles | 2 +- go.work | 3 + .../src/home/.config/home-manager/home.nix | 1 + toxic | 2 +- 7 files changed, 84 insertions(+), 48 deletions(-) create mode 100644 go.work diff --git a/.bazelrc b/.bazelrc index 705c77f8..cf61e5f0 100644 --- a/.bazelrc +++ b/.bazelrc @@ -393,12 +393,19 @@ build --per_file_copt='moc_.*\\.cpp$@-Wno-gnu-zero-variadic-macro-arguments' build --per_file_copt='moc_.*\\.cpp$@-Wno-redundant-parens' build --per_file_copt='moc_.*\\.cpp$@-Wno-undefined-reinterpret-cast' +# Protobuf generated code. +build --per_file_copt='\\.pb\\.cc$@-Wno-global-constructors,-Wno-exit-time-destructors' +build --per_file_copt='\\.pb\\.cc$@-Wno-missing-prototypes' +build --per_file_copt='\\.pb\\.cc$@-Wno-c++20-compat' + # TODO(iphydf): Fix these. build --per_file_copt='//c-toxcore@-Wno-shadow-uncaptured-local' build --per_file_copt='//c-toxcore@-Wno-sign-compare' build --per_file_copt='//c-toxcore@-Wno-unused-but-set-variable' build --per_file_copt='//experimental@-Wno-switch-enum' build --per_file_copt='//experimental@-Wno-used-but-marked-unused' +build --per_file_copt='//jvm-toxcore-c@-Wno-error=switch' +build --per_file_copt='//jvm-toxcore-c@-Wno-global-constructors,-Wno-exit-time-destructors' build --per_file_copt='//qtox@-Wno-comma' build --per_file_copt='//qtox@-Wno-deprecated' build --per_file_copt='//qtox@-Wno-documentation' @@ -430,7 +437,6 @@ build --per_file_copt='//toxic@-Wno-missing-variable-declarations' build --per_file_copt='//toxic@-Wno-sign-compare' build --per_file_copt='//toxic@-Wno-switch-enum' build --per_file_copt='//toxic@-Wno-undef' -build --per_file_copt='//toxic@-Wno-unused-macros' build --per_file_copt='//toxins@-Wno-cast-align' build --per_file_copt='//toxins@-Wno-global-constructors,-Wno-exit-time-destructors' build --per_file_copt='//toxins@-Wno-missing-prototypes' @@ -489,6 +495,10 @@ build --per_file_copt='external/boringssl[:/]@-Wno-used-but-marked-unused' build --per_file_copt='external/com_google_absl[:/]@-Wno-atomic-implicit-seq-cst' build --per_file_copt='external/com_google_absl[:/]@-Wno-tautological-type-limit-compare' build --per_file_copt='external/com_google_absl[:/]@-Wno-unused-template' +build --per_file_copt='external/com_google_protobuf[:/]@-Wno-extra-semi' +build --per_file_copt='external/com_google_protobuf[:/]@-Wno-unused-function' +build --per_file_copt='external/com_google_protobuf[:/]@-Wno-unused-member-function' +build --per_file_copt='external/com_google_protobuf[:/]@-Wno-unused-template' build --per_file_copt='external/curl[:/]@-Wno-cast-function-type-strict' build --per_file_copt='external/curl[:/]@-Wno-used-but-marked-unused' build --per_file_copt='external/ev[:/]@-Wno-bitwise-op-parentheses' diff --git a/WORKSPACE b/WORKSPACE index 6507d525..d4dcc8a0 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -57,6 +57,59 @@ zig_register_toolchains( zig_version = "0.11.0", ) +# Python +# ========================================================= + +load("//tools/workspace:python.bzl", "python_repository") + +github_archive( + name = "rules_python", + repo = "bazelbuild/rules_python", + sha256 = "9110e83a233c9edce177241f3ae95eae4e4cc3b602d845878d76ad4e3bab7c60", + version = "0.31.0", +) + +load("@rules_python//python:repositories.bzl", "py_repositories") + +py_repositories() + +python_repository( + name = "python3", +) + +# https://github.com/cython/cython +github_archive( + name = "cython", + repo = "cython/cython", + sha256 = "ca1d767ebd1296f4dc93da397595f9ea3cd5f7d3347748b12c19cfd9eee6fee7", + version = "3.0.8", +) + +# https://github.com/python/mypy +new_github_archive( + name = "mypy", + repo = "python/mypy", + sha256 = "9fa0ac71f11162280e54768381614d1ad0b1648e4198633a9033bbad7574ce67", + version = "v1.8.0", +) + +# https://github.com/python/mypy_extensions +new_github_archive( + name = "mypy_extensions", + repo = "python/mypy_extensions", + sha256 = "73a374063a9e5685d9e424462bf8ba1013c79169733eefbd20010ee5d6157a73", + version = "1.0.0", +) + +# https://github.com/python/typing_extensions +new_github_archive( + name = "typing_extensions", + repo = "python/typing_extensions", + sha256 = "23d3202b2a220832bf81b8f0184d4d91b8d21abde2700fdcdca6ff9f02eb2619", + strip_prefix = "/src", + version = "4.9.0", +) + # Fuzzing # ========================================================= @@ -64,8 +117,8 @@ zig_register_toolchains( github_archive( name = "rules_fuzzing", repo = "bazelbuild/rules_fuzzing", - sha256 = "ff52ef4845ab00e95d29c02a9e32e9eff4e0a4c9c8a6bcf8407a2f19eb3f9190", - version = "v0.4.1", + sha256 = "15e3fc7fd7d41b77b30eed059821bdf0bac714f4686c69a9e5379762326bc9b4", + version = "d17a7d79c881cb8b1a1ba1d2e41c1adf1d60b23b", ) load("@rules_fuzzing//fuzzing:repositories.bzl", "rules_fuzzing_dependencies") @@ -270,6 +323,17 @@ github_archive( version = "5.3", ) +load("@rules_jvm_external//:defs.bzl", "maven_install") + +maven_install( + artifacts = [ + "junit:junit:4.13.2", + ], + repositories = [ + "https://repo1.maven.org/maven2", + ], +) + # https://github.com/bazelbuild/stardoc github_archive( name = "io_bazel_stardoc", @@ -804,48 +868,6 @@ nixpkgs_package( repository = "@nixpkgs", ) -# Python -# ========================================================= - -load("//tools/workspace:python.bzl", "python_repository") - -python_repository( - name = "python3", -) - -# https://github.com/cython/cython -github_archive( - name = "cython", - repo = "cython/cython", - sha256 = "ca1d767ebd1296f4dc93da397595f9ea3cd5f7d3347748b12c19cfd9eee6fee7", - version = "3.0.8", -) - -# https://github.com/python/mypy -new_github_archive( - name = "mypy", - repo = "python/mypy", - sha256 = "9fa0ac71f11162280e54768381614d1ad0b1648e4198633a9033bbad7574ce67", - version = "v1.8.0", -) - -# https://github.com/python/mypy_extensions -new_github_archive( - name = "mypy_extensions", - repo = "python/mypy_extensions", - sha256 = "73a374063a9e5685d9e424462bf8ba1013c79169733eefbd20010ee5d6157a73", - version = "1.0.0", -) - -# https://github.com/python/typing_extensions -new_github_archive( - name = "typing_extensions", - repo = "python/typing_extensions", - sha256 = "23d3202b2a220832bf81b8f0184d4d91b8d21abde2700fdcdca6ff9f02eb2619", - strip_prefix = "/src", - version = "4.9.0", -) - # Node.js # ========================================================= diff --git a/c-toxcore b/c-toxcore index 710eb674..0627c367 160000 --- a/c-toxcore +++ b/c-toxcore @@ -1 +1 @@ -Subproject commit 710eb674a50f17201bb7556d389d82d2133d98de +Subproject commit 0627c36716fb0c3990ce23fbd6b9478102884de8 diff --git a/dockerfiles b/dockerfiles index 16cc6556..b92374cb 160000 --- a/dockerfiles +++ b/dockerfiles @@ -1 +1 @@ -Subproject commit 16cc65567d0d552d350e075441140f066f8f3a5f +Subproject commit b92374cb1b6471cc4a370cd7f26a69532b5fad09 diff --git a/go.work b/go.work new file mode 100644 index 00000000..55101ec3 --- /dev/null +++ b/go.work @@ -0,0 +1,3 @@ +go 1.21.4 + +use ./c-toxcore/other/bootstrap_daemon/websocket/websockify diff --git a/tools/built/src/home/.config/home-manager/home.nix b/tools/built/src/home/.config/home-manager/home.nix index e491f48a..e7921698 100644 --- a/tools/built/src/home/.config/home-manager/home.nix +++ b/tools/built/src/home/.config/home-manager/home.nix @@ -30,6 +30,7 @@ connect # for ssh proxy via tor gdb # debugger for C code gnupg # for signing git commits + go # for vscode to understand Go haskell-language-server # for vscode to understand Haskell man-pages # libc documentation man-pages-posix # libc documentation (POSIX functions) diff --git a/toxic b/toxic index 2e0b85dd..a1c969a7 160000 --- a/toxic +++ b/toxic @@ -1 +1 @@ -Subproject commit 2e0b85dda5d15d1f1f98fb659921109b2126291a +Subproject commit a1c969a78418b67eb2e999efd862d3d916844d1a