From ae50f0678abca7544308a3337b7f7ede5948c8a1 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 11 Jan 2023 10:01:46 +1000 Subject: [PATCH] Revert "bazel_6: 6.0.0-pre.20220720.3 -> 6.0.0" --- .../build-managers/bazel/bazel_6/default.nix | 17 +- .../bazel/bazel_6/src-deps.json | 549 ++++++------------ .../darwin/apple-sdk-11.0/frameworks.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 175 insertions(+), 395 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix index 6f86be80f9a..832ca7062d5 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -26,22 +26,22 @@ }: let - version = "6.0.0"; + version = "6.0.0-pre.20220720.3"; sourceRoot = "."; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - hash = "sha256-e8DFFFwZpW2CoI/OaQjF4aDnXk+/s7bxK03q5/SzjLw="; + hash = "sha256-i8d4yLSq8fL+YT11wYmBvLDLSprq1gVfyjsKBYci1bk="; }; - # Update with `eval $(nix-build -A bazel_6.updater)`, + # Update with `eval $(nix-build -A bazel_5.updater)`, # then add new dependencies from the dict in ./src-deps.json as required. srcDeps = lib.attrsets.attrValues srcDepsSet; srcDepsSet = let srcs = lib.importJSON ./src-deps.json; toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl { - urls = d.urls or [d.url]; + urls = d.urls; sha256 = d.sha256; }); in builtins.listToAttrs (map toFetchurl [ @@ -54,8 +54,8 @@ let srcs.remote_java_tools_for_testing srcs."coverage_output_generator-v2.6.zip" srcs.build_bazel_rules_nodejs - srcs.android_tools_for_testing - srcs.openjdk_linux_vanilla + srcs."android_tools_pkg-0.26.0.tar.gz" + srcs."zulu11.56.19-ca-jdk11.0.15-linux_x64.tar.gz" srcs.bazel_toolchains srcs.com_github_grpc_grpc srcs.upb @@ -69,9 +69,6 @@ let srcs.com_google_absl srcs.com_googlesource_code_re2 srcs.com_github_cares_cares - srcs.com_envoyproxy_protoc_gen_validate - srcs.com_google_googleapis - srcs.bazel_gazelle ]); distDir = runCommand "bazel-deps" {} '' @@ -389,7 +386,7 @@ stdenv.mkDerivation rec { sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl sed -i -e 's;"/usr/bin/libtool";_find_generic(repository_ctx, "libtool", "LIBTOOL", overriden_tools);g' tools/cpp/unix_cc_configure.bzl - wrappers=( tools/cpp/osx_cc_wrapper.sh.tpl ) + wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl ) for wrapper in "''${wrappers[@]}"; do sed -i -e "s,/usr/bin/gcc,${stdenv.cc}/bin/clang,g" $wrapper sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json index ae10299be91..032ec1f80a8 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json @@ -23,20 +23,12 @@ "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz" ] }, - "2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz": { - "name": "2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz", - "sha256": "5bb6b0253ccf64b53d6c7249625a7e3f6c3bc6402abd52d3778bfa48258703a0", + "2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz": { + "name": "2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz", + "sha256": "6a5f67874af66b239b709c572ac1a5a00fdb1b29beaf13c3e6f79b1ba10dc7c4", "urls": [ - "https://mirror.bazel.build/github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz", - "https://github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz" - ] - }, - "4694024279bdac52b77e22dc87808bd0fd732b69.tar.gz": { - "name": "4694024279bdac52b77e22dc87808bd0fd732b69.tar.gz", - "sha256": "1e490b98005664d149b379a9529a6aa05932b8a11b76b4cd86f3d22d76346f47", - "urls": [ - "https://mirror.bazel.build/github.com/envoyproxy/protoc-gen-validate/archive/4694024279bdac52b77e22dc87808bd0fd732b69.tar.gz", - "https://github.com/envoyproxy/protoc-gen-validate/archive/4694024279bdac52b77e22dc87808bd0fd732b69.tar.gz" + "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz", + "https://github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz" ] }, "5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip": { @@ -47,14 +39,6 @@ "https://github.com/google/desugar_jdk_libs/archive/5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip" ] }, - "6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz": { - "name": "6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz", - "sha256": "ec76c5e79db59762776bece58b69507d095856c37b81fd35bfb0958e74b61d93", - "urls": [ - "https://mirror.bazel.build/github.com/c-ares/c-ares/archive/6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz", - "https://github.com/c-ares/c-ares/archive/6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz" - ] - }, "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": { "name": "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", @@ -71,14 +55,6 @@ "https://github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz" ] }, - "a5477045acaa34586420942098f5fecd3570f577.tar.gz": { - "name": "a5477045acaa34586420942098f5fecd3570f577.tar.gz", - "sha256": "cf7f71eaff90b24c1a28b49645a9ff03a9a6c1e7134291ce70901cb63e7364b5", - "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/a5477045acaa34586420942098f5fecd3570f577.tar.gz", - "https://github.com/protocolbuffers/upb/archive/a5477045acaa34586420942098f5fecd3570f577.tar.gz" - ] - }, "aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz": { "name": "aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz", "sha256": "9f385e146410a8150b6f4cb1a57eab7ec806ced48d427554b1e754877ff26c3e", @@ -102,22 +78,22 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "1afa4b7e13c82523c8b69e87f8d598c891ec7e2baa41d9e24e08becd723edb4d", - "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.0.tar.gz" + "sha256": "a86d205da8bd08515d18bb4b98e4b66b8805e57008ec55118ff5ce038c57a5f1", + "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.26.0.tar.gz" }, - "android_tools_pkg-0.27.0.tar.gz": { - "name": "android_tools_pkg-0.27.0.tar.gz", - "sha256": "1afa4b7e13c82523c8b69e87f8d598c891ec7e2baa41d9e24e08becd723edb4d", + "android_tools_pkg-0.26.0.tar.gz": { + "name": "android_tools_pkg-0.26.0.tar.gz", + "sha256": "a86d205da8bd08515d18bb4b98e4b66b8805e57008ec55118ff5ce038c57a5f1", "urls": [ - "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.0.tar.gz" + "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.26.0.tar.gz" ] }, - "bazel-gazelle-v0.24.0.tar.gz": { - "name": "bazel-gazelle-v0.24.0.tar.gz", - "sha256": "de69a09dc70417580aabf20a28619bb3ef60d038470c7cf8442fafcf627c21cb", + "b1c40e1de81913a3c40e5948f78719c28152486d.zip": { + "name": "b1c40e1de81913a3c40e5948f78719c28152486d.zip", + "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz", - "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip", + "https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip" ] }, "bazel-skylib-1.0.3.tar.gz": { @@ -140,13 +116,14 @@ ] }, "bazel_gazelle": { - "generator_function": "dist_http_archive", + "generator_function": "grpc_deps", "generator_name": "bazel_gazelle", "name": "bazel_gazelle", - "sha256": "de69a09dc70417580aabf20a28619bb3ef60d038470c7cf8442fafcf627c21cb", + "sha256": "d987004a72697334a095bbaa18d615804a28280201a50ed6c234c40ccc41e493", + "strip_prefix": "bazel-gazelle-0.19.1", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz", - "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/bazel-gazelle/archive/v0.19.1.tar.gz", + "https://github.com/bazelbuild/bazel-gazelle/archive/v0.19.1.tar.gz" ] }, "bazel_skylib": { @@ -171,11 +148,11 @@ "generator_function": "grpc_deps", "generator_name": "bazel_toolchains", "name": "bazel_toolchains", - "sha256": "179ec02f809e86abf56356d8898c8bd74069f1bd7c56044050c2cd3d79d0e024", - "strip_prefix": "bazel-toolchains-4.1.0", + "sha256": "0b36eef8a66f39c8dbae88e522d5bbbef49d5e66e834a982402c79962281be10", + "strip_prefix": "bazel-toolchains-1.0.1", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/4.1.0.tar.gz", - "https://github.com/bazelbuild/bazel-toolchains/releases/download/4.1.0/bazel-toolchains-4.1.0.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/1.0.1.tar.gz", + "https://github.com/bazelbuild/bazel-toolchains/releases/download/1.0.1/bazel-toolchains-1.0.1.tar.gz" ] }, "bazelci_rules": { @@ -209,31 +186,32 @@ "generator_function": "grpc_deps", "generator_name": "boringssl", "name": "boringssl", - "sha256": "534fa658bd845fd974b50b10f444d392dfd0d93768c4a51b61263fd37d851c40", - "strip_prefix": "boringssl-b9232f9e27e5668bc0414879dcdedb2a59ea75f2", + "sha256": "6f640262999cd1fb33cf705922e453e835d2d20f3f06fe0d77f6426c19257308", + "strip_prefix": "boringssl-fc44652a42b396e1645d5e72aba053349992136a", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/b9232f9e27e5668bc0414879dcdedb2a59ea75f2.tar.gz", - "https://github.com/google/boringssl/archive/b9232f9e27e5668bc0414879dcdedb2a59ea75f2.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/fc44652a42b396e1645d5e72aba053349992136a.tar.gz", + "https://github.com/google/boringssl/archive/fc44652a42b396e1645d5e72aba053349992136a.tar.gz" ] }, "build_bazel_apple_support": { "generator_function": "grpc_deps", "generator_name": "build_bazel_apple_support", "name": "build_bazel_apple_support", - "sha256": "76df040ade90836ff5543888d64616e7ba6c3a7b33b916aa3a4b68f342d1b447", + "sha256": "122ebf7fe7d1c8e938af6aeaee0efe788a3a2449ece5a8d6a428cb18d6f88033", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/apple_support/releases/download/0.11.0/apple_support.0.11.0.tar.gz", - "https://github.com/bazelbuild/apple_support/releases/download/0.11.0/apple_support.0.11.0.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/apple_support/releases/download/0.7.1/apple_support.0.7.1.tar.gz", + "https://github.com/bazelbuild/apple_support/releases/download/0.7.1/apple_support.0.7.1.tar.gz" ] }, "build_bazel_rules_apple": { "generator_function": "grpc_deps", "generator_name": "build_bazel_rules_apple", "name": "build_bazel_rules_apple", - "sha256": "0052d452af7742c8f3a4e0929763388a66403de363775db7e90adecb2ba4944b", + "sha256": "bdc8e66e70b8a75da23b79f1f8c6207356df07d041d96d2189add7ee0780cf4e", + "strip_prefix": "rules_apple-b869b0d3868d78a1d4ffd866ccb304fb68aa12c3", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/rules_apple/releases/download/0.31.3/rules_apple.0.31.3.tar.gz", - "https://github.com/bazelbuild/rules_apple/releases/download/0.31.3/rules_apple.0.31.3.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/rules_apple/archive/b869b0d3868d78a1d4ffd866ccb304fb68aa12c3.tar.gz", + "https://github.com/bazelbuild/rules_apple/archive/b869b0d3868d78a1d4ffd866ccb304fb68aa12c3.tar.gz" ] }, "build_bazel_rules_nodejs": { @@ -246,29 +224,15 @@ "https://github.com/bazelbuild/rules_nodejs/releases/download/5.5.0/rules_nodejs-5.5.0.tar.gz" ] }, - "cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz": { - "name": "cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz", - "sha256": "5bc8365613fe2f8ce6cc33959b7667b13b7fe56cb9d16ba740c06e1a7c4242fc", - "urls": [ - "https://mirror.bazel.build/github.com/cncf/xds/archive/cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz", - "https://github.com/cncf/xds/archive/cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz" - ] - }, "com_envoyproxy_protoc_gen_validate": { - "generator_function": "dist_http_archive", + "generator_function": "grpc_deps", "generator_name": "com_envoyproxy_protoc_gen_validate", "name": "com_envoyproxy_protoc_gen_validate", - "patch_args": [ - "-p1" - ], - "patches": [ - "//third_party/protoc_gen_validate:protoc_gen_validate.patch" - ], - "sha256": "1e490b98005664d149b379a9529a6aa05932b8a11b76b4cd86f3d22d76346f47", - "strip_prefix": "protoc-gen-validate-4694024279bdac52b77e22dc87808bd0fd732b69", + "sha256": "dd4962e4a9e8388a4fbc5c33e64d73bdb222f103e4bad40ca5535f81c2c606c2", + "strip_prefix": "protoc-gen-validate-59da36e59fef2267fc2b1849a05159e3ecdf24f3", "urls": [ - "https://mirror.bazel.build/github.com/envoyproxy/protoc-gen-validate/archive/4694024279bdac52b77e22dc87808bd0fd732b69.tar.gz", - "https://github.com/envoyproxy/protoc-gen-validate/archive/4694024279bdac52b77e22dc87808bd0fd732b69.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/protoc-gen-validate/archive/59da36e59fef2267fc2b1849a05159e3ecdf24f3.tar.gz", + "https://github.com/envoyproxy/protoc-gen-validate/archive/59da36e59fef2267fc2b1849a05159e3ecdf24f3.tar.gz" ] }, "com_github_cares_cares": { @@ -276,39 +240,22 @@ "generator_function": "grpc_deps", "generator_name": "com_github_cares_cares", "name": "com_github_cares_cares", - "sha256": "ec76c5e79db59762776bece58b69507d095856c37b81fd35bfb0958e74b61d93", - "strip_prefix": "c-ares-6654436a307a5a686b008c1d4c93b0085da6e6d8", + "sha256": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a", + "strip_prefix": "c-ares-e982924acee7f7313b4baa4ee5ec000c5e373c30", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/c-ares/c-ares/archive/6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz", - "https://github.com/c-ares/c-ares/archive/6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz" - ] - }, - "com_github_cncf_udpa": { - "generator_function": "dist_http_archive", - "generator_name": "com_github_cncf_udpa", - "name": "com_github_cncf_udpa", - "patch_args": [ - "-p1" - ], - "patches": [ - "//third_party/cncf_udpa:cncf_udpa_0.0.1.patch" - ], - "sha256": "5bc8365613fe2f8ce6cc33959b7667b13b7fe56cb9d16ba740c06e1a7c4242fc", - "strip_prefix": "xds-cb28da3451f158a947dfc45090fe92b07b243bc1", - "urls": [ - "https://mirror.bazel.build/github.com/cncf/xds/archive/cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz", - "https://github.com/cncf/xds/archive/cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", + "https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz" ] }, "com_github_google_benchmark": { "generator_function": "grpc_deps", "generator_name": "com_github_google_benchmark", "name": "com_github_google_benchmark", - "sha256": "0b921a3bc39e35f4275c8dcc658af2391c150fb966102341287b0401ff2e6f21", - "strip_prefix": "benchmark-0baacde3618ca617da95375e0af13ce1baadea47", + "sha256": "daa4a97e0547d76de300e325a49177b199f3689ce5a35e25d47696f7cb050f86", + "strip_prefix": "benchmark-73d4d5e8d6d449fc8663765a42aa8aeeee844489", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/benchmark/archive/0baacde3618ca617da95375e0af13ce1baadea47.tar.gz", - "https://github.com/google/benchmark/archive/0baacde3618ca617da95375e0af13ce1baadea47.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/benchmark/archive/73d4d5e8d6d449fc8663765a42aa8aeeee844489.tar.gz", + "https://github.com/google/benchmark/archive/73d4d5e8d6d449fc8663765a42aa8aeeee844489.tar.gz" ] }, "com_github_grpc_grpc": { @@ -319,26 +266,14 @@ "-p1" ], "patches": [ - "//third_party/grpc:grpc_1.47.0.patch", - "//third_party/grpc:grpc_1.47.0.win_arm64.patch" + "//third_party/grpc:grpc_1.41.0.patch", + "//third_party/grpc:grpc_1.41.0.win_arm64.patch" ], - "sha256": "271bdc890bf329a8de5b65819f0f9590a5381402429bca37625b63546ed19e54", - "strip_prefix": "grpc-1.47.0", + "sha256": "e5fb30aae1fa1cffa4ce00aa0bbfab908c0b899fcf0bbc30e268367d660d8656", + "strip_prefix": "grpc-1.41.0", "urls": [ - "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.47.0.tar.gz", - "https://github.com/grpc/grpc/archive/v1.47.0.tar.gz" - ] - }, - "com_github_libuv_libuv": { - "build_file": "@com_github_grpc_grpc//third_party:libuv.BUILD", - "generator_function": "grpc_deps", - "generator_name": "com_github_libuv_libuv", - "name": "com_github_libuv_libuv", - "sha256": "5ca4e9091f3231d8ad8801862dc4e851c23af89c69141d27723157776f7291e7", - "strip_prefix": "libuv-02a9e1be252b623ee032a3137c0b0c94afbe6809", - "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/libuv/libuv/archive/02a9e1be252b623ee032a3137c0b0c94afbe6809.tar.gz", - "https://github.com/libuv/libuv/archive/02a9e1be252b623ee032a3137c0b0c94afbe6809.tar.gz" + "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.41.0.tar.gz", + "https://github.com/grpc/grpc/archive/v1.41.0.tar.gz" ] }, "com_google_absl": { @@ -353,23 +288,23 @@ ] }, "com_google_googleapis": { - "generator_function": "dist_http_archive", + "generator_function": "grpc_deps", "generator_name": "com_google_googleapis", "name": "com_google_googleapis", "sha256": "5bb6b0253ccf64b53d6c7249625a7e3f6c3bc6402abd52d3778bfa48258703a0", "strip_prefix": "googleapis-2f9af297c84c55c8b871ba4495e01ade42476c92", "urls": [ - "https://mirror.bazel.build/github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz", + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz", "https://github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz" ] }, "com_google_googletest": { "name": "com_google_googletest", - "sha256": "81964fe578e9bd7c94dfdb09c8e4d6e6759e19967e397dbea48d1c10e45d0df2", - "strip_prefix": "googletest-release-1.12.1", + "sha256": "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb", + "strip_prefix": "googletest-release-1.10.0", "urls": [ - "https://mirror.bazel.build/github.com/google/googletest/archive/refs/tags/release-1.12.1.tar.gz", - "https://github.com/google/googletest/archive/refs/tags/release-1.12.1.tar.gz" + "https://mirror.bazel.build/github.com/google/googletest/archive/release-1.10.0.tar.gz", + "https://github.com/google/googletest/archive/release-1.10.0.tar.gz" ] }, "com_google_protobuf": { @@ -388,13 +323,13 @@ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], "patches": [ - "//third_party/protobuf:3.19.6.patch" + "//third_party/protobuf:3.19.2.patch" ], - "sha256": "9a301cf94a8ddcb380b901e7aac852780b826595075577bb967004050c835056", - "strip_prefix": "protobuf-3.19.6", + "sha256": "4dd35e788944b7686aac898f77df4e9a54da0ca694b8801bd6b2a9ffc1b3085e", + "strip_prefix": "protobuf-3.19.2", "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.19.6.tar.gz", - "https://github.com/protocolbuffers/protobuf/archive/v3.19.6.tar.gz" + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.19.2.tar.gz", + "https://github.com/protocolbuffers/protobuf/archive/v3.19.2.tar.gz" ] }, "com_google_testparameterinjector": { @@ -411,11 +346,11 @@ "generator_function": "grpc_deps", "generator_name": "com_googlesource_code_re2", "name": "com_googlesource_code_re2", - "sha256": "319a58a58d8af295db97dfeecc4e250179c5966beaa2d842a82f0a013b6a239b", - "strip_prefix": "re2-8e08f47b11b413302749c0d8b17a1c94777495d5", + "sha256": "9f385e146410a8150b6f4cb1a57eab7ec806ced48d427554b1e754877ff26c3e", + "strip_prefix": "re2-aecba11114cf1fac5497aeb844b6966106de3eb6", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/re2/archive/8e08f47b11b413302749c0d8b17a1c94777495d5.tar.gz", - "https://github.com/google/re2/archive/8e08f47b11b413302749c0d8b17a1c94777495d5.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz", + "https://github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz" ] }, "coverage_output_generator-v2.6.zip": { @@ -430,10 +365,10 @@ "generator_function": "grpc_deps", "generator_name": "cython", "name": "cython", - "sha256": "bb72b2f0ef029472759c711f0a4bded6e15e3f9bda3797550cef3c1d87d02283", - "strip_prefix": "cython-0.29.26", + "sha256": "e2e38e1f0572ca54d6085df3dec8b607d20e81515fb80215aed19c81e8fe2079", + "strip_prefix": "cython-0.29.21", "urls": [ - "https://github.com/cython/cython/archive/0.29.26.tar.gz" + "https://github.com/cython/cython/archive/0.29.21.tar.gz" ] }, "desugar_jdk_libs": { @@ -447,6 +382,14 @@ "https://github.com/google/desugar_jdk_libs/archive/5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip" ] }, + "e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz": { + "name": "e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", + "sha256": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a", + "urls": [ + "https://mirror.bazel.build/github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", + "https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz" + ] + }, "enum34": { "build_file": "@com_github_grpc_grpc//third_party:enum34.BUILD", "generator_function": "grpc_deps", @@ -462,11 +405,11 @@ "generator_function": "grpc_deps", "generator_name": "envoy_api", "name": "envoy_api", - "sha256": "c5807010b67033330915ca5a20483e30538ae5e689aa14b3631d6284beca4630", - "strip_prefix": "data-plane-api-9c42588c956220b48eb3099d186487c2f04d32ec", + "sha256": "330f2f9c938fc038b7ab438919b692d30cdfba3cf596e7824410f88da16c30b5", + "strip_prefix": "data-plane-api-2f0d081fab0b0823f088c6e368f40e1992f46fcd", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/data-plane-api/archive/9c42588c956220b48eb3099d186487c2f04d32ec.tar.gz", - "https://github.com/envoyproxy/data-plane-api/archive/9c42588c956220b48eb3099d186487c2f04d32ec.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/data-plane-api/archive/2f0d081fab0b0823f088c6e368f40e1992f46fcd.tar.gz", + "https://github.com/envoyproxy/data-plane-api/archive/2f0d081fab0b0823f088c6e368f40e1992f46fcd.tar.gz" ] }, "futures": { @@ -484,24 +427,18 @@ "generator_function": "grpc_deps", "generator_name": "io_bazel_rules_go", "name": "io_bazel_rules_go", - "sha256": "69de5c704a05ff37862f7e0f5534d4f479418afc21806c887db544a316f3cb6b", + "sha256": "dbf5a9ef855684f84cac2e7ae7886c5a001d4f66ae23f6904da0faaaef0d61fc", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.27.0/rules_go-v0.27.0.tar.gz", - "https://github.com/bazelbuild/rules_go/releases/download/v0.27.0/rules_go-v0.27.0.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.24.11/rules_go-v0.24.11.tar.gz", + "https://github.com/bazelbuild/rules_go/releases/download/v0.24.11/rules_go-v0.24.11.tar.gz" ] }, "io_bazel_rules_python": { "generator_function": "grpc_deps", "generator_name": "io_bazel_rules_python", "name": "io_bazel_rules_python", - "patch_args": [ - "-p1" - ], - "patches": [ - "@com_github_grpc_grpc//third_party:rules_python.patch" - ], - "sha256": "954aa89b491be4a083304a2cb838019c8b8c3720a7abb9c4cb81ac7a24230cea", - "url": "https://github.com/bazelbuild/rules_python/releases/download/0.4.0/rules_python-0.4.0.tar.gz" + "sha256": "aa96a691d3a8177f3215b14b0edc9641787abaaa30363a080165d06ab65e1161", + "url": "https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz" }, "io_bazel_rules_sass": { "generator_function": "dist_http_archive", @@ -536,36 +473,36 @@ "https://github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz" ] }, - "java_tools-v11.9.zip": { - "name": "java_tools-v11.9.zip", - "sha256": "5cd59ea6bf938a1efc1e11ea562d37b39c82f76781211b7cd941a2346ea8484d", + "java_tools-v11.8.zip": { + "name": "java_tools-v11.8.zip", + "sha256": "8fb4d3138bd92a9d3324dae29c9f70d91ca2db18cd0bf1997446eed4657d19b3", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools-v11.9.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools-v11.9.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools-v11.8.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools-v11.8.zip" ] }, - "java_tools_darwin-v11.9.zip": { - "name": "java_tools_darwin-v11.9.zip", - "sha256": "b9e962c6a836ba1d7573f2473fab3a897c6370d4c2724bde4017b40932ff4fe4", + "java_tools_darwin-v11.8.zip": { + "name": "java_tools_darwin-v11.8.zip", + "sha256": "0dcf4500cc4a1de8e563c1d48a079a7a0cf77cc246e39fd37fcc78ddf409ed26", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_darwin-v11.9.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_darwin-v11.9.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_darwin-v11.8.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_darwin-v11.8.zip" ] }, - "java_tools_linux-v11.9.zip": { - "name": "java_tools_linux-v11.9.zip", - "sha256": "512582cac5b7ea7974a77b0da4581b21f546c9478f206eedf54687eeac035989", + "java_tools_linux-v11.8.zip": { + "name": "java_tools_linux-v11.8.zip", + "sha256": "41502b293eea292b0577b46e8d7738bfe88180562acbf99ed620b5387a60efee", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_linux-v11.9.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_linux-v11.9.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_linux-v11.8.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_linux-v11.8.zip" ] }, - "java_tools_windows-v11.9.zip": { - "name": "java_tools_windows-v11.9.zip", - "sha256": "677ab910046205020fd715489147c2bcfad8a35d9f5d94fdc998d217545bd87a", + "java_tools_windows-v11.8.zip": { + "name": "java_tools_windows-v11.8.zip", + "sha256": "056ed8ba64920409eab63e3c4888c1970a523d2c03965784fc3243e37195318b", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_windows-v11.9.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_windows-v11.9.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_windows-v11.8.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_windows-v11.8.zip" ] }, "microsoft-jdk-11.0.13.8.1-windows-aarch64.zip": { @@ -575,126 +512,6 @@ "https://mirror.bazel.build/aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-aarch64.zip" ] }, - "nuget_python_i686_3.10.0": { - "build_file_content": "\ncc_import(\n name = \"python_full_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python310.dll\",\n interface_library = \"libs/python310.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n name = \"python_limited_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python3.dll\",\n interface_library = \"libs/python3.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n", - "generator_function": "grpc_extra_deps", - "generator_name": "nuget_python_i686_3.10.0", - "name": "nuget_python_i686_3.10.0", - "patch_cmds": [ - "cp -r include/* ." - ], - "sha256": "e115e102eb90ce160ab0ef7506b750a8d7ecc385bde0a496f02a54337a8bc333", - "strip_prefix": "tools", - "type": "zip", - "urls": [ - "https://www.nuget.org/api/v2/package/pythonx86/3.10.0" - ] - }, - "nuget_python_i686_3.7.0": { - "build_file_content": "\ncc_import(\n name = \"python_full_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python37.dll\",\n interface_library = \"libs/python37.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n name = \"python_limited_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python3.dll\",\n interface_library = \"libs/python3.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n", - "generator_function": "grpc_extra_deps", - "generator_name": "nuget_python_i686_3.7.0", - "name": "nuget_python_i686_3.7.0", - "patch_cmds": [ - "cp -r include/* ." - ], - "sha256": "a8bb49fa1ca62ad55430fcafaca1b58015e22943e66b1a87d5e7cef2556c6a54", - "strip_prefix": "tools", - "type": "zip", - "urls": [ - "https://www.nuget.org/api/v2/package/pythonx86/3.7.0" - ] - }, - "nuget_python_i686_3.8.0": { - "build_file_content": "\ncc_import(\n name = \"python_full_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python38.dll\",\n interface_library = \"libs/python38.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n name = \"python_limited_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python3.dll\",\n interface_library = \"libs/python3.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n", - "generator_function": "grpc_extra_deps", - "generator_name": "nuget_python_i686_3.8.0", - "name": "nuget_python_i686_3.8.0", - "patch_cmds": [ - "cp -r include/* ." - ], - "sha256": "87a6481f5eef30b42ac12c93f06f73bd0b8692f26313b76a6615d1641c4e7bca", - "strip_prefix": "tools", - "type": "zip", - "urls": [ - "https://www.nuget.org/api/v2/package/pythonx86/3.8.0" - ] - }, - "nuget_python_i686_3.9.0": { - "build_file_content": "\ncc_import(\n name = \"python_full_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python39.dll\",\n interface_library = \"libs/python39.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n name = \"python_limited_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python3.dll\",\n interface_library = \"libs/python3.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n", - "generator_function": "grpc_extra_deps", - "generator_name": "nuget_python_i686_3.9.0", - "name": "nuget_python_i686_3.9.0", - "patch_cmds": [ - "cp -r include/* ." - ], - "sha256": "229abecbe49dc08fe5709e0b31e70edfb3b88f23335ebfc2904c44f940fd59b6", - "strip_prefix": "tools", - "type": "zip", - "urls": [ - "https://www.nuget.org/api/v2/package/pythonx86/3.9.0" - ] - }, - "nuget_python_x86-64_3.10.0": { - "build_file_content": "\ncc_import(\n name = \"python_full_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python310.dll\",\n interface_library = \"libs/python310.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n name = \"python_limited_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python3.dll\",\n interface_library = \"libs/python3.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n", - "generator_function": "grpc_extra_deps", - "generator_name": "nuget_python_x86-64_3.10.0", - "name": "nuget_python_x86-64_3.10.0", - "patch_cmds": [ - "cp -r include/* ." - ], - "sha256": "4474c83c25625d93e772e926f95f4cd398a0abbb52793625fa30f39af3d2cc00", - "strip_prefix": "tools", - "type": "zip", - "urls": [ - "https://www.nuget.org/api/v2/package/python/3.10.0" - ] - }, - "nuget_python_x86-64_3.7.0": { - "build_file_content": "\ncc_import(\n name = \"python_full_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python37.dll\",\n interface_library = \"libs/python37.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n name = \"python_limited_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python3.dll\",\n interface_library = \"libs/python3.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n", - "generator_function": "grpc_extra_deps", - "generator_name": "nuget_python_x86-64_3.7.0", - "name": "nuget_python_x86-64_3.7.0", - "patch_cmds": [ - "cp -r include/* ." - ], - "sha256": "66eb796a5bdb1e6787b8f655a1237a6b6964af2115b7627cf4f0032cf068b4b2", - "strip_prefix": "tools", - "type": "zip", - "urls": [ - "https://www.nuget.org/api/v2/package/python/3.7.0" - ] - }, - "nuget_python_x86-64_3.8.0": { - "build_file_content": "\ncc_import(\n name = \"python_full_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python38.dll\",\n interface_library = \"libs/python38.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n name = \"python_limited_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python3.dll\",\n interface_library = \"libs/python3.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n", - "generator_function": "grpc_extra_deps", - "generator_name": "nuget_python_x86-64_3.8.0", - "name": "nuget_python_x86-64_3.8.0", - "patch_cmds": [ - "cp -r include/* ." - ], - "sha256": "96c61321ce90dd053c8a04f305a5f6cc6d91350b862db34440e4a4f069b708a0", - "strip_prefix": "tools", - "type": "zip", - "urls": [ - "https://www.nuget.org/api/v2/package/python/3.8.0" - ] - }, - "nuget_python_x86-64_3.9.0": { - "build_file_content": "\ncc_import(\n name = \"python_full_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python39.dll\",\n interface_library = \"libs/python39.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n name = \"python_limited_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python3.dll\",\n interface_library = \"libs/python3.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n", - "generator_function": "grpc_extra_deps", - "generator_name": "nuget_python_x86-64_3.9.0", - "name": "nuget_python_x86-64_3.9.0", - "patch_cmds": [ - "cp -r include/* ." - ], - "sha256": "6af58a733e7dfbfcdd50d55788134393d6ffe7ab8270effbf724bdb786558832", - "strip_prefix": "tools", - "type": "zip", - "urls": [ - "https://www.nuget.org/api/v2/package/python/3.9.0" - ] - }, "opencensus_proto": { "generator_function": "grpc_deps", "generator_name": "opencensus_proto", @@ -1080,19 +897,6 @@ "https://github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz" ] }, - "python-3.7.0": { - "build_file_content": "\ncc_library(\n name = \"python_headers\",\n hdrs = glob([\"**/Include/**/*.h\"]),\n strip_include_prefix = \"Python-3.7.0/Include\",\n visibility = [\"//visibility:public\"],\n)\n", - "generator_function": "grpc_extra_deps", - "generator_name": "python-3.7.0", - "name": "python-3.7.0", - "patch_cmds": [ - "echo '#define SIZEOF_WCHAR_T 4' > Python-3.7.0/Include/pyconfig.h" - ], - "sha256": "85bb9feb6863e04fb1700b018d9d42d1caac178559ffa453d7e6a436e259fd0d", - "urls": [ - "https://www.python.org/ftp/python/3.7.0/Python-3.7.0.tgz" - ] - }, "r8-3.3.28.jar": { "name": "r8-3.3.28.jar", "sha256": "8626ca32fb47aba7fddd2c897615e2e8ffcdb4d4b213572a2aefb3f838f01972", @@ -1129,10 +933,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "b9e962c6a836ba1d7573f2473fab3a897c6370d4c2724bde4017b40932ff4fe4", + "sha256": "0dcf4500cc4a1de8e563c1d48a079a7a0cf77cc246e39fd37fcc78ddf409ed26", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_darwin-v11.9.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_darwin-v11.9.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_darwin-v11.8.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_darwin-v11.8.zip" ] }, "remote_java_tools_for_testing": { @@ -1147,10 +951,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "5cd59ea6bf938a1efc1e11ea562d37b39c82f76781211b7cd941a2346ea8484d", + "sha256": "8fb4d3138bd92a9d3324dae29c9f70d91ca2db18cd0bf1997446eed4657d19b3", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools-v11.9.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools-v11.9.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools-v11.8.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools-v11.8.zip" ] }, "remote_java_tools_linux": { @@ -1175,10 +979,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "512582cac5b7ea7974a77b0da4581b21f546c9478f206eedf54687eeac035989", + "sha256": "41502b293eea292b0577b46e8d7738bfe88180562acbf99ed620b5387a60efee", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_linux-v11.9.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_linux-v11.9.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_linux-v11.8.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_linux-v11.8.zip" ] }, "remote_java_tools_test": { @@ -1193,10 +997,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "5cd59ea6bf938a1efc1e11ea562d37b39c82f76781211b7cd941a2346ea8484d", + "sha256": "8fb4d3138bd92a9d3324dae29c9f70d91ca2db18cd0bf1997446eed4657d19b3", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools-v11.9.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools-v11.9.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools-v11.8.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools-v11.8.zip" ] }, "remote_java_tools_test_darwin": { @@ -1211,10 +1015,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "b9e962c6a836ba1d7573f2473fab3a897c6370d4c2724bde4017b40932ff4fe4", + "sha256": "0dcf4500cc4a1de8e563c1d48a079a7a0cf77cc246e39fd37fcc78ddf409ed26", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_darwin-v11.9.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_darwin-v11.9.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_darwin-v11.8.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_darwin-v11.8.zip" ] }, "remote_java_tools_test_linux": { @@ -1229,10 +1033,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "512582cac5b7ea7974a77b0da4581b21f546c9478f206eedf54687eeac035989", + "sha256": "41502b293eea292b0577b46e8d7738bfe88180562acbf99ed620b5387a60efee", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_linux-v11.9.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_linux-v11.9.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_linux-v11.8.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_linux-v11.8.zip" ] }, "remote_java_tools_test_windows": { @@ -1247,10 +1051,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "677ab910046205020fd715489147c2bcfad8a35d9f5d94fdc998d217545bd87a", + "sha256": "056ed8ba64920409eab63e3c4888c1970a523d2c03965784fc3243e37195318b", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_windows-v11.9.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_windows-v11.9.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_windows-v11.8.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_windows-v11.8.zip" ] }, "remote_java_tools_windows": { @@ -1275,10 +1079,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "677ab910046205020fd715489147c2bcfad8a35d9f5d94fdc998d217545bd87a", + "sha256": "056ed8ba64920409eab63e3c4888c1970a523d2c03965784fc3243e37195318b", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_windows-v11.9.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_windows-v11.9.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_windows-v11.8.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_windows-v11.8.zip" ] }, "remotejdk11_linux": { @@ -1813,16 +1617,11 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "58bff40957ace85c2de21ebfc72e53ed3a0d33af8cc20abd0ceec55c63be7de2", + "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd", + "strip_prefix": "rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d", "urls": [ - "https://github.com/bazelbuild/rules_cc/releases/download/0.0.2/rules_cc-0.0.2.tar.gz" - ] - }, - "rules_cc-0.0.2.tar.gz": { - "name": "rules_cc-0.0.2.tar.gz", - "sha256": "58bff40957ace85c2de21ebfc72e53ed3a0d33af8cc20abd0ceec55c63be7de2", - "urls": [ - "https://github.com/bazelbuild/rules_cc/releases/download/0.0.2/rules_cc-0.0.2.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip", + "https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip" ] }, "rules_java": { @@ -1946,38 +1745,38 @@ ] }, "upb": { - "generator_function": "dist_http_archive", + "generator_function": "grpc_deps", "generator_name": "upb", "name": "upb", - "sha256": "cf7f71eaff90b24c1a28b49645a9ff03a9a6c1e7134291ce70901cb63e7364b5", - "strip_prefix": "upb-a5477045acaa34586420942098f5fecd3570f577", + "sha256": "6a5f67874af66b239b709c572ac1a5a00fdb1b29beaf13c3e6f79b1ba10dc7c4", + "strip_prefix": "upb-2de300726a1ba2de9a468468dc5ff9ed17a3215f", "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/a5477045acaa34586420942098f5fecd3570f577.tar.gz", - "https://github.com/protocolbuffers/upb/archive/a5477045acaa34586420942098f5fecd3570f577.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz", + "https://github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz" ] }, - "v1.47.0.tar.gz": { - "name": "v1.47.0.tar.gz", - "sha256": "271bdc890bf329a8de5b65819f0f9590a5381402429bca37625b63546ed19e54", + "v1.41.0.tar.gz": { + "name": "v1.41.0.tar.gz", + "sha256": "e5fb30aae1fa1cffa4ce00aa0bbfab908c0b899fcf0bbc30e268367d660d8656", "urls": [ - "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.47.0.tar.gz", - "https://github.com/grpc/grpc/archive/v1.47.0.tar.gz" + "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.41.0.tar.gz", + "https://github.com/grpc/grpc/archive/v1.41.0.tar.gz" ] }, - "v1.5.2-3.zip": { - "name": "v1.5.2-3.zip", - "sha256": "366009a43cfada35015e4cc40a7efc4b7f017c6b8df5cac3f87d2478027b2056", + "v1.5.0-4.zip": { + "name": "v1.5.0-4.zip", + "sha256": "d320d59b89a163c5efccbe4915ae6a49883ce653cdc670643dfa21c6063108e4", "urls": [ - "https://mirror.bazel.build/github.com/luben/zstd-jni/archive/refs/tags/v1.5.2-3.zip", - "https://github.com/luben/zstd-jni/archive/refs/tags/v1.5.2-3.zip" + "https://mirror.bazel.build/github.com/luben/zstd-jni/archive/v1.5.0-4.zip", + "https://github.com/luben/zstd-jni/archive/v1.5.0-4.zip" ] }, - "v3.19.6.tar.gz": { - "name": "v3.19.6.tar.gz", - "sha256": "9a301cf94a8ddcb380b901e7aac852780b826595075577bb967004050c835056", + "v3.19.2.tar.gz": { + "name": "v3.19.2.tar.gz", + "sha256": "4dd35e788944b7686aac898f77df4e9a54da0ca694b8801bd6b2a9ffc1b3085e", "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.19.6.tar.gz", - "https://github.com/protocolbuffers/protobuf/archive/v3.19.6.tar.gz" + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.19.2.tar.gz", + "https://github.com/protocolbuffers/protobuf/archive/v3.19.2.tar.gz" ] }, "zlib": { @@ -1985,11 +1784,11 @@ "generator_function": "grpc_deps", "generator_name": "zlib", "name": "zlib", - "sha256": "ef47b0fbe646d69a2fc5ba012cb278de8e8946a8e9649f83a807cc05559f0eff", - "strip_prefix": "zlib-21767c654d31d2dccdde4330529775c6c5fd5389", + "sha256": "6d4d6640ca3121620995ee255945161821218752b551a1a180f4215f7d124d45", + "strip_prefix": "zlib-cacf7f1d4e3d44d871b605da3b647f07d718623f", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/madler/zlib/archive/21767c654d31d2dccdde4330529775c6c5fd5389.tar.gz", - "https://github.com/madler/zlib/archive/21767c654d31d2dccdde4330529775c6c5fd5389.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/madler/zlib/archive/cacf7f1d4e3d44d871b605da3b647f07d718623f.tar.gz", + "https://github.com/madler/zlib/archive/cacf7f1d4e3d44d871b605da3b647f07d718623f.tar.gz" ] }, "zstd-jni": { @@ -2011,11 +1810,11 @@ "patches": [ "//third_party:zstd-jni/Native.java.patch" ], - "sha256": "366009a43cfada35015e4cc40a7efc4b7f017c6b8df5cac3f87d2478027b2056", - "strip_prefix": "zstd-jni-1.5.2-3", + "sha256": "d320d59b89a163c5efccbe4915ae6a49883ce653cdc670643dfa21c6063108e4", + "strip_prefix": "zstd-jni-1.5.0-4", "urls": [ - "https://mirror.bazel.build/github.com/luben/zstd-jni/archive/refs/tags/v1.5.2-3.zip", - "https://github.com/luben/zstd-jni/archive/refs/tags/v1.5.2-3.zip" + "https://mirror.bazel.build/github.com/luben/zstd-jni/archive/v1.5.0-4.zip", + "https://github.com/luben/zstd-jni/archive/v1.5.0-4.zip" ] }, "zulu11.56.19-ca-jdk11.0.15-linux_aarch64.tar.gz": { @@ -2066,22 +1865,6 @@ "https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip" ] }, - "zulu17.32.13-ca-jdk17.0.2-linux_aarch64.tar.gz": { - "name": "zulu17.32.13-ca-jdk17.0.2-linux_aarch64.tar.gz", - "sha256": "2b8066bbdbc5cff422bb6b6db1b8f8d362b576340cce8492f1255502af632b06", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_aarch64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_aarch64.tar.gz" - ] - }, - "zulu18.28.13-ca-jdk18.0.0-linux_aarch64.tar.gz": { - "name": "zulu18.28.13-ca-jdk18.0.0-linux_aarch64.tar.gz", - "sha256": "a1d5f78172f32f819d08e9043b0f82fa7af738b37c55c6ca8d6092c61d204d53", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-linux_aarch64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-linux_aarch64.tar.gz" - ] - }, "zulu18.28.13-ca-jdk18.0.0-win_aarch64.zip": { "name": "zulu18.28.13-ca-jdk18.0.0-win_aarch64.zip", "sha256": "9b52b259516e4140ee56b91f77750667bffbc543e78ad8c39082449d4c377b54", diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix index 8c2a9a4d548..dc4ab1955b5 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix @@ -159,7 +159,7 @@ ScreenSaver = {}; ScreenTime = {}; ScriptingBridge = {}; - Security = { inherit IOKit libDER xpc; }; + Security = { inherit IOKit libDER; }; SecurityFoundation = { inherit Security; }; SecurityInterface = { inherit Security SecurityFoundation; }; SensorKit = {}; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9df70b5ce9..f33f49a051f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16841,7 +16841,7 @@ with pkgs; bazel-remote = callPackage ../development/tools/build-managers/bazel/bazel-remote { }; - bazel-watcher = darwin.apple_sdk_11_0.callPackage ../development/tools/bazel-watcher { + bazel-watcher = callPackage ../development/tools/bazel-watcher { go = go_1_18; };