From 5a14400712abed85825f1d96dc79719651a57e22 Mon Sep 17 00:00:00 2001 From: Dmitry Ivankov Date: Fri, 12 May 2023 11:39:40 +0200 Subject: [PATCH 1/2] bazel_6: 6.1.2 -> 6.2.0 https://github.com/bazelbuild/bazel/releases/tag/6.2.0 --- .../tensorflow-probability/default.nix | 2 +- .../build-managers/bazel/bazel_6/default.nix | 4 +- .../bazel/bazel_6/src-deps.json | 250 ++++++++++-------- pkgs/servers/http/envoy/default.nix | 4 +- 4 files changed, 152 insertions(+), 108 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index dcf3ba89bda9..7c5147c4e556 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -54,7 +54,7 @@ let LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool"; fetchAttrs = { - sha256 = "sha256-kEiwwYAUABcINdSaAyRDSFKtKLPj3axdNvXvkI1k0Uo="; + sha256 = "sha256-tMiZsX5OyVw6VVImn4nWwEFdBw+TKKbE7oACibQC0oA="; }; buildAttrs = { 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 fe78b6029369..de69c79b6ea0 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -24,12 +24,12 @@ }: let - version = "6.1.2"; + version = "6.2.0"; sourceRoot = "."; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - hash = "sha256-b7PuIv6fqG2C4XNXLVBMCJ8Qgl10lyVZJibgkLOMlnk="; + hash = "sha256-8ej3iGN6xXTUcdYZ0glrqsoEoZtXoDQ5ngeWM9tEGUU="; }; # Update with 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 59153bd99af1..c39723aa455f 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 @@ -538,36 +538,44 @@ "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-v12.3.zip": { + "name": "java_tools-v12.3.zip", + "sha256": "cbb62ecfef61568ded46260a8e8e8430755db7ec9638c0c7ff668a656f6c042f", "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/v12.3/java_tools-v12.3.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools-v12.3.zip" ] }, - "java_tools_darwin-v11.9.zip": { - "name": "java_tools_darwin-v11.9.zip", - "sha256": "b9e962c6a836ba1d7573f2473fab3a897c6370d4c2724bde4017b40932ff4fe4", + "java_tools_darwin_arm64-v12.3.zip": { + "name": "java_tools_darwin_arm64-v12.3.zip", + "sha256": "29aa0c2de4e3cf45bc55d2995ba803ecbd1173a8d363860abbc309551db7931b", "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/v12.3/java_tools_darwin_arm64-v12.3.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_darwin_arm64-v12.3.zip" ] }, - "java_tools_linux-v11.9.zip": { - "name": "java_tools_linux-v11.9.zip", - "sha256": "512582cac5b7ea7974a77b0da4581b21f546c9478f206eedf54687eeac035989", + "java_tools_darwin_x86_64-v12.3.zip": { + "name": "java_tools_darwin_x86_64-v12.3.zip", + "sha256": "3c3fb1967a0f35c73ff509505de53ca4611518922a6b7c8c22a468aa7503132c", "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/v12.3/java_tools_darwin_x86_64-v12.3.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_darwin_x86_64-v12.3.zip" ] }, - "java_tools_windows-v11.9.zip": { - "name": "java_tools_windows-v11.9.zip", - "sha256": "677ab910046205020fd715489147c2bcfad8a35d9f5d94fdc998d217545bd87a", + "java_tools_linux-v12.3.zip": { + "name": "java_tools_linux-v12.3.zip", + "sha256": "32157b5218b151009f5b99bf5e2f65e28823d269dfbba8cd57e7da5e7cdd291d", "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/v12.3/java_tools_linux-v12.3.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_linux-v12.3.zip" + ] + }, + "java_tools_windows-v12.3.zip": { + "name": "java_tools_windows-v12.3.zip", + "sha256": "ec6f91387d2353eacb0ca0492f35f68c5c7b0e7a80acd1fb825088b4b069fab1", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_windows-v12.3.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_windows-v12.3.zip" ] }, "microsoft-jdk-11.0.13.8.1-windows-aarch64.zip": { @@ -772,11 +780,11 @@ "generator_function": "dist_http_archive", "generator_name": "openjdk17_darwin_aarch64_archive", "name": "openjdk17_darwin_aarch64_archive", - "sha256": "54247dde248ffbcd3c048675504b1c503b81daf2dc0d64a79e353c48d383c977", - "strip_prefix": "zulu17.32.13-ca-jdk17.0.2-macosx_aarch64", + "sha256": "515dd56ec99bb5ae8966621a2088aadfbe72631818ffbba6e4387b7ee292ab09", + "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-macosx_aarch64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_aarch64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_aarch64.tar.gz" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_aarch64.tar.gz" ] }, "openjdk17_darwin_archive": { @@ -784,11 +792,11 @@ "generator_function": "dist_http_archive", "generator_name": "openjdk17_darwin_archive", "name": "openjdk17_darwin_archive", - "sha256": "89d04b2d99b05dcb25114178e65f6a1c5ca742e125cab0a63d87e7e42f3fcb80", - "strip_prefix": "zulu17.32.13-ca-jdk17.0.2-macosx_x64", + "sha256": "e6317cee4d40995f0da5b702af3f04a6af2bbd55febf67927696987d11113b53", + "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-macosx_x64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_x64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_x64.tar.gz" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_x64.tar.gz" ] }, "openjdk17_linux_archive": { @@ -796,11 +804,11 @@ "generator_function": "dist_http_archive", "generator_name": "openjdk17_linux_archive", "name": "openjdk17_linux_archive", - "sha256": "73d5c4bae20325ca41b606f7eae64669db3aac638c5b3ead4a975055846ad6de", - "strip_prefix": "zulu17.32.13-ca-jdk17.0.2-linux_x64", + "sha256": "20c91a922eec795f3181eaa70def8b99d8eac56047c9a14bfb257c85b991df1b", + "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-linux_x64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_x64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_x64.tar.gz" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_x64.tar.gz" ] }, "openjdk17_windows_archive": { @@ -808,11 +816,11 @@ "generator_function": "dist_http_archive", "generator_name": "openjdk17_windows_archive", "name": "openjdk17_windows_archive", - "sha256": "e965aa0ea7a0661a3446cf8f10ee00684b851f883b803315289f26b4aa907fdb", - "strip_prefix": "zulu17.32.13-ca-jdk17.0.2-win_x64", + "sha256": "9972c5b62a61b45785d3d956c559e079d9e91f144ec46225f5deeda214d48f27", + "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-win_x64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-win_x64.zip", - "https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-win_x64.zip" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_x64.zip", + "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_x64.zip" ] }, "openjdk17_windows_arm64_archive": { @@ -820,11 +828,11 @@ "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", + "sha256": "bc3476f2161bf99bc9a243ff535b8fc033b34ce9a2fa4b62fb8d79b6bfdc427f", + "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-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" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip", + "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip" ] }, "openjdk18_darwin_aarch64_archive": { @@ -1030,10 +1038,10 @@ "generator_function": "dist_http_file", "generator_name": "openjdk_win_arm64_vanilla", "name": "openjdk_win_arm64_vanilla", - "sha256": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877", + "sha256": "bc3476f2161bf99bc9a243ff535b8fc033b34ce9a2fa4b62fb8d79b6bfdc427f", "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" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip", + "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip" ] }, "openjdk_win_minimal": { @@ -1139,10 +1147,10 @@ "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_darwin-v11.9.zip" ] }, - "remote_java_tools_darwin_for_testing": { + "remote_java_tools_darwin_arm64_for_testing": { "generator_function": "dist_http_archive", - "generator_name": "remote_java_tools_darwin_for_testing", - "name": "remote_java_tools_darwin_for_testing", + "generator_name": "remote_java_tools_darwin_arm64_for_testing", + "name": "remote_java_tools_darwin_arm64_for_testing", "patch_cmds": [ "test -f BUILD && chmod u+w BUILD || true", "echo >> BUILD", @@ -1151,10 +1159,28 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "b9e962c6a836ba1d7573f2473fab3a897c6370d4c2724bde4017b40932ff4fe4", + "sha256": "29aa0c2de4e3cf45bc55d2995ba803ecbd1173a8d363860abbc309551db7931b", "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/v12.3/java_tools_darwin_arm64-v12.3.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_darwin_arm64-v12.3.zip" + ] + }, + "remote_java_tools_darwin_x86_64_for_testing": { + "generator_function": "dist_http_archive", + "generator_name": "remote_java_tools_darwin_x86_64_for_testing", + "name": "remote_java_tools_darwin_x86_64_for_testing", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "3c3fb1967a0f35c73ff509505de53ca4611518922a6b7c8c22a468aa7503132c", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_darwin_x86_64-v12.3.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_darwin_x86_64-v12.3.zip" ] }, "remote_java_tools_for_testing": { @@ -1169,10 +1195,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "5cd59ea6bf938a1efc1e11ea562d37b39c82f76781211b7cd941a2346ea8484d", + "sha256": "cbb62ecfef61568ded46260a8e8e8430755db7ec9638c0c7ff668a656f6c042f", "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/v12.3/java_tools-v12.3.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools-v12.3.zip" ] }, "remote_java_tools_linux": { @@ -1197,10 +1223,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "512582cac5b7ea7974a77b0da4581b21f546c9478f206eedf54687eeac035989", + "sha256": "32157b5218b151009f5b99bf5e2f65e28823d269dfbba8cd57e7da5e7cdd291d", "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/v12.3/java_tools_linux-v12.3.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_linux-v12.3.zip" ] }, "remote_java_tools_test": { @@ -1215,16 +1241,16 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "5cd59ea6bf938a1efc1e11ea562d37b39c82f76781211b7cd941a2346ea8484d", + "sha256": "cbb62ecfef61568ded46260a8e8e8430755db7ec9638c0c7ff668a656f6c042f", "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/v12.3/java_tools-v12.3.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools-v12.3.zip" ] }, - "remote_java_tools_test_darwin": { + "remote_java_tools_test_darwin_arm64": { "generator_function": "dist_http_archive", - "generator_name": "remote_java_tools_test_darwin", - "name": "remote_java_tools_test_darwin", + "generator_name": "remote_java_tools_test_darwin_arm64", + "name": "remote_java_tools_test_darwin_arm64", "patch_cmds": [ "test -f BUILD && chmod u+w BUILD || true", "echo >> BUILD", @@ -1233,10 +1259,28 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "b9e962c6a836ba1d7573f2473fab3a897c6370d4c2724bde4017b40932ff4fe4", + "sha256": "29aa0c2de4e3cf45bc55d2995ba803ecbd1173a8d363860abbc309551db7931b", "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/v12.3/java_tools_darwin_arm64-v12.3.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_darwin_arm64-v12.3.zip" + ] + }, + "remote_java_tools_test_darwin_x86_64": { + "generator_function": "dist_http_archive", + "generator_name": "remote_java_tools_test_darwin_x86_64", + "name": "remote_java_tools_test_darwin_x86_64", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "3c3fb1967a0f35c73ff509505de53ca4611518922a6b7c8c22a468aa7503132c", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_darwin_x86_64-v12.3.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_darwin_x86_64-v12.3.zip" ] }, "remote_java_tools_test_linux": { @@ -1251,10 +1295,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "512582cac5b7ea7974a77b0da4581b21f546c9478f206eedf54687eeac035989", + "sha256": "32157b5218b151009f5b99bf5e2f65e28823d269dfbba8cd57e7da5e7cdd291d", "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/v12.3/java_tools_linux-v12.3.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_linux-v12.3.zip" ] }, "remote_java_tools_test_windows": { @@ -1269,10 +1313,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "677ab910046205020fd715489147c2bcfad8a35d9f5d94fdc998d217545bd87a", + "sha256": "ec6f91387d2353eacb0ca0492f35f68c5c7b0e7a80acd1fb825088b4b069fab1", "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/v12.3/java_tools_windows-v12.3.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_windows-v12.3.zip" ] }, "remote_java_tools_windows": { @@ -1297,10 +1341,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "677ab910046205020fd715489147c2bcfad8a35d9f5d94fdc998d217545bd87a", + "sha256": "ec6f91387d2353eacb0ca0492f35f68c5c7b0e7a80acd1fb825088b4b069fab1", "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/v12.3/java_tools_windows-v12.3.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_windows-v12.3.zip" ] }, "remotejdk11_linux": { @@ -1594,11 +1638,11 @@ "patch_cmds_win": [ "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "73d5c4bae20325ca41b606f7eae64669db3aac638c5b3ead4a975055846ad6de", - "strip_prefix": "zulu17.32.13-ca-jdk17.0.2-linux_x64", + "sha256": "20c91a922eec795f3181eaa70def8b99d8eac56047c9a14bfb257c85b991df1b", + "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-linux_x64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_x64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_x64.tar.gz" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_x64.tar.gz" ] }, "remotejdk17_macos": { @@ -1638,11 +1682,11 @@ "patch_cmds_win": [ "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "54247dde248ffbcd3c048675504b1c503b81daf2dc0d64a79e353c48d383c977", - "strip_prefix": "zulu17.32.13-ca-jdk17.0.2-macosx_aarch64", + "sha256": "515dd56ec99bb5ae8966621a2088aadfbe72631818ffbba6e4387b7ee292ab09", + "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-macosx_aarch64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_aarch64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_aarch64.tar.gz" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_aarch64.tar.gz" ] }, "remotejdk17_macos_for_testing": { @@ -1658,11 +1702,11 @@ "patch_cmds_win": [ "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "89d04b2d99b05dcb25114178e65f6a1c5ca742e125cab0a63d87e7e42f3fcb80", - "strip_prefix": "zulu17.32.13-ca-jdk17.0.2-macosx_x64", + "sha256": "e6317cee4d40995f0da5b702af3f04a6af2bbd55febf67927696987d11113b53", + "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-macosx_x64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_x64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_x64.tar.gz" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_x64.tar.gz" ] }, "remotejdk17_win": { @@ -1702,11 +1746,11 @@ "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", + "sha256": "bc3476f2161bf99bc9a243ff535b8fc033b34ce9a2fa4b62fb8d79b6bfdc427f", + "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-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" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip", + "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip" ] }, "remotejdk17_win_for_testing": { @@ -1722,11 +1766,11 @@ "patch_cmds_win": [ "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "e965aa0ea7a0661a3446cf8f10ee00684b851f883b803315289f26b4aa907fdb", - "strip_prefix": "zulu17.32.13-ca-jdk17.0.2-win_x64", + "sha256": "9972c5b62a61b45785d3d956c559e079d9e91f144ec46225f5deeda214d48f27", + "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-win_x64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-win_x64.zip", - "https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-win_x64.zip" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_x64.zip", + "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_x64.zip" ] }, "remotejdk18_linux": { @@ -2158,20 +2202,20 @@ "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-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", + "zulu17.38.21-ca-jdk17.0.5-linux_aarch64.tar.gz": { + "name": "zulu17.38.21-ca-jdk17.0.5-linux_aarch64.tar.gz", + "sha256": "dbc6ae9163e7ff469a9ab1f342cd1bc1f4c1fb78afc3c4f2228ee3b32c4f3e43", "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" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_aarch64.tar.gz" ] }, - "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", + "zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip": { + "name": "zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip", + "sha256": "bc3476f2161bf99bc9a243ff535b8fc033b34ce9a2fa4b62fb8d79b6bfdc427f", "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" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip", + "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip" ] }, "zulu18.28.13-ca-jdk18.0.0-linux_aarch64.tar.gz": { diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index 787d80e03ac8..97f25ad71d3e 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -80,8 +80,8 @@ buildBazelPackage rec { fetchAttrs = { sha256 = { - x86_64-linux = "sha256-jx8RavJKlBtZQtZf4GrUkOlhM6qI4LO5lK3HRgn1vzE="; - aarch64-linux = "sha256-toEPrGVh61sHsVbhsideMmnX8uXIN+2x8LuZpczTEdw="; + x86_64-linux = "sha256-mw3k2r4heoAcBdcc7uYdnotUBrF1nM5Vmqbay+2DkjI="; + aarch64-linux = "sha256-rR6EFEFh01P9T42g9OlM15xP7V4ya4TQJ2bjUWjSaxU="; }.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); dontUseCmakeConfigure = true; dontUseGnConfigure = true; From 4d494b82ded158526dd53482da6e8c5af15c1921 Mon Sep 17 00:00:00 2001 From: divanorama Date: Fri, 12 May 2023 22:04:55 +0200 Subject: [PATCH 2/2] Update pkgs/servers/http/envoy/default.nix --- pkgs/servers/http/envoy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index 97f25ad71d3e..5fbaeb5e2391 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -81,7 +81,7 @@ buildBazelPackage rec { fetchAttrs = { sha256 = { x86_64-linux = "sha256-mw3k2r4heoAcBdcc7uYdnotUBrF1nM5Vmqbay+2DkjI="; - aarch64-linux = "sha256-rR6EFEFh01P9T42g9OlM15xP7V4ya4TQJ2bjUWjSaxU="; + aarch64-linux = "sha256-2gSxzm7SXvrGEgwZnp5KdEpbV/+zdosf8Z5lrkK3QiI="; }.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); dontUseCmakeConfigure = true; dontUseGnConfigure = true;