From 8c5ed979bea1bebf3a1b650ed36638925cd344ea Mon Sep 17 00:00:00 2001 From: betaboon Date: Wed, 13 Apr 2022 12:53:42 +0200 Subject: [PATCH] bazel_5: 5.0.0 -> 5.1.1 --- .../build-managers/bazel/bazel_5/default.nix | 4 +- .../bazel/bazel_5/src-deps.json | 112 +++++++++++++++--- 2 files changed, 100 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index 8770174ab26c..60e708bb47c8 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -26,12 +26,12 @@ }: let - version = "5.0.0"; + version = "5.1.1"; sourceRoot = "."; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "By3WLSN9vBHgusAuEY2MLbTQujugnxoOseKkYPuEGds="; + sha256 = "f107wdNEaSskAPN2X9S1wLY26056insXkjCVx7VqT3g="; }; # Update with `eval $(nix-build -A bazel.updater)`, diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json index ff010d01aa08..5282e9efc3c1 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json @@ -15,6 +15,14 @@ "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz" ] }, + "20211102.0.tar.gz": { + "name": "20211102.0.tar.gz", + "sha256": "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4", + "urls": [ + "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz", + "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz" + ] + }, "2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz": { "name": "2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz", "sha256": "6a5f67874af66b239b709c572ac1a5a00fdb1b29beaf13c3e6f79b1ba10dc7c4", @@ -47,14 +55,6 @@ "https://github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz" ] }, - "997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz": { - "name": "997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz", - "sha256": "35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee", - "urls": [ - "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz", - "https://github.com/abseil/abseil-cpp/archive/997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz" - ] - }, "aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz": { "name": "aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz", "sha256": "9f385e146410a8150b6f4cb1a57eab7ec806ced48d427554b1e754877ff26c3e", @@ -282,7 +282,8 @@ "-p1" ], "patches": [ - "//third_party/grpc:grpc_1.41.0.patch" + "//third_party/grpc:grpc_1.41.0.patch", + "//third_party/grpc:grpc_1.41.0.win_arm64.patch" ], "sha256": "e5fb30aae1fa1cffa4ce00aa0bbfab908c0b899fcf0bbc30e268367d660d8656", "strip_prefix": "grpc-1.41.0", @@ -292,14 +293,14 @@ ] }, "com_google_absl": { - "generator_function": "grpc_deps", + "generator_function": "dist_http_archive", "generator_name": "com_google_absl", "name": "com_google_absl", - "sha256": "35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee", - "strip_prefix": "abseil-cpp-997aaf3a28308eba1b9156aa35ab7bca9688e9f6", + "sha256": "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4", + "strip_prefix": "abseil-cpp-20211102.0", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz", - "https://github.com/abseil/abseil-cpp/archive/997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz" + "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz", + "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz" ] }, "com_google_googleapis": { @@ -772,6 +773,13 @@ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-4.2.1.tar" ] }, + "microsoft-jdk-11.0.13.8.1-windows-aarch64.zip": { + "name": "microsoft-jdk-11.0.13.8.1-windows-aarch64.zip", + "sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2", + "urls": [ + "https://mirror.bazel.build/aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-aarch64.zip" + ] + }, "opencensus_proto": { "generator_function": "grpc_deps", "generator_name": "opencensus_proto", @@ -820,6 +828,15 @@ "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-win_x64.zip" ] }, + "openjdk11_windows_arm64_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk11_windows_arm64_archive", + "sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2", + "strip_prefix": "jdk-11.0.13+8", + "urls": [ + "https://mirror.bazel.build/aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-aarch64.zip" + ] + }, "openjdk15_darwin_aarch64_archive": { "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", "name": "openjdk15_darwin_aarch64_archive", @@ -940,6 +957,18 @@ "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-win_x64.zip" ] }, + "openjdk17_windows_arm64_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "generator_function": "dist_http_archive", + "generator_name": "openjdk17_windows_arm64_archive", + "name": "openjdk17_windows_arm64_archive", + "sha256": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877", + "strip_prefix": "zulu17.30.15-ca-jdk17.0.1-win_aarch64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip", + "https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip" + ] + }, "openjdk_linux": { "downloaded_file_path": "zulu-linux.tar.gz", "name": "openjdk_linux", @@ -1063,6 +1092,14 @@ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689080.zip" ] }, + "openjdk_win_arm64_vanilla": { + "downloaded_file_path": "zulu-win-arm64.zip", + "name": "openjdk_win_arm64_vanilla", + "sha256": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip" + ] + }, "openjdk_win_minimal": { "downloaded_file_path": "zulu-win-minimal.zip", "name": "openjdk_win_minimal", @@ -1472,6 +1509,25 @@ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" ] }, + "remotejdk11_win_arm64_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "generator_function": "dist_http_archive", + "generator_name": "remotejdk11_win_arm64_for_testing", + "name": "remotejdk11_win_arm64_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2", + "strip_prefix": "jdk-11.0.13+8", + "urls": [ + "https://mirror.bazel.build/aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-aarch64.zip" + ] + }, "remotejdk11_win_for_testing": { "build_file": "@local_jdk//:BUILD.bazel", "name": "remotejdk11_win_for_testing", @@ -1768,6 +1824,26 @@ "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_x64.tar.gz" ] }, + "remotejdk17_win_arm64_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "generator_function": "dist_http_archive", + "generator_name": "remotejdk17_win_arm64_for_testing", + "name": "remotejdk17_win_arm64_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877", + "strip_prefix": "zulu17.30.15-ca-jdk17.0.1-win_aarch64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip", + "https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip" + ] + }, "remotejdk17_win_for_testing": { "build_file": "@local_jdk//:BUILD.bazel", "name": "remotejdk17_win_for_testing", @@ -1986,5 +2062,13 @@ "urls": [ "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-win_x64.zip" ] + }, + "zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip": { + "name": "zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip", + "sha256": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip", + "https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip" + ] } }