bazel: 5.1.1 -> 5.2.0
This commit is contained in:
parent
9cbcd62ada
commit
7c3d4d3af8
|
@ -216,9 +216,9 @@ let
|
||||||
fetchAttrs = {
|
fetchAttrs = {
|
||||||
sha256 =
|
sha256 =
|
||||||
if cudaSupport then
|
if cudaSupport then
|
||||||
"0d2rqwk9n4a6c51m4g21rxymv85kw2sdksni30cdx3pdcdbqgic7"
|
"sha256-Ald+vplRx/DDG/7TfHAqD4Gktb1BGnf7FSCCJzSI0eo="
|
||||||
else
|
else
|
||||||
"0q540mwmh7grig0qq48ynzqi0gynimxnrq7k97wribqpkx99k39d";
|
"sha256-6acSbBNcUBw177HMVOmpV7pUfP1aFSe5cP6/zWFdGFo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildAttrs = {
|
buildAttrs = {
|
||||||
|
|
|
@ -26,15 +26,15 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "5.1.1";
|
version = "5.2.0";
|
||||||
sourceRoot = ".";
|
sourceRoot = ".";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
|
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
|
||||||
sha256 = "f107wdNEaSskAPN2X9S1wLY26056insXkjCVx7VqT3g=";
|
sha256 = "sha256-ggqU27FAce1tjCZs8MCA7LJlpe6mUwdXlInEZiwtWCo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Update with `eval $(nix-build -A bazel.updater)`,
|
# Update with `eval $(nix-build -A bazel_5.updater)`,
|
||||||
# then add new dependencies from the dict in ./src-deps.json as required.
|
# then add new dependencies from the dict in ./src-deps.json as required.
|
||||||
srcDeps = lib.attrsets.attrValues srcDepsSet;
|
srcDeps = lib.attrsets.attrValues srcDepsSet;
|
||||||
srcDepsSet =
|
srcDepsSet =
|
||||||
|
@ -211,7 +211,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
# Additional tests that check bazel’s functionality. Execute
|
# Additional tests that check bazel’s functionality. Execute
|
||||||
#
|
#
|
||||||
# nix-build . -A bazel.tests
|
# nix-build . -A bazel_5.tests
|
||||||
#
|
#
|
||||||
# in the nixpkgs checkout root to exercise them locally.
|
# in the nixpkgs checkout root to exercise them locally.
|
||||||
passthru.tests =
|
passthru.tests =
|
||||||
|
|
|
@ -489,20 +489,20 @@
|
||||||
"https://github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz"
|
"https://github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"java_tools-v11.6.zip": {
|
"java_tools-v11.7.1.zip": {
|
||||||
"name": "java_tools-v11.6.zip",
|
"name": "java_tools-v11.7.1.zip",
|
||||||
"sha256": "a7ac5922ee01e8b8fcb546ffc264ef314d0a0c679328b7fa4c432e5f54a86067",
|
"sha256": "2eede49b2d80135e0ea22180f63df26db2ed4b795c1c041b25cc653d6019fbec",
|
||||||
"urls": [
|
"urls": [
|
||||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.6/java_tools-v11.6.zip",
|
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools-v11.7.1.zip",
|
||||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.6/java_tools-v11.6.zip"
|
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools-v11.7.1.zip"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"java_tools_darwin-v11.6.zip": {
|
"java_tools_darwin-v11.7.1.zip": {
|
||||||
"name": "java_tools_darwin-v11.6.zip",
|
"name": "java_tools_darwin-v11.7.1.zip",
|
||||||
"sha256": "f17ee54582b61f1ebd84c8fa2c54df796914cfbaac3cb821fb1286b55b080bc0",
|
"sha256": "4d6d388b54ad3b9aa35b30dd67af8d71c4c240df8cfb5000bbec67bdd5c53a73",
|
||||||
"urls": [
|
"urls": [
|
||||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.6/java_tools_darwin-v11.6.zip",
|
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools_darwin-v11.7.1.zip",
|
||||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.6/java_tools_darwin-v11.6.zip"
|
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools_darwin-v11.7.1.zip"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"java_tools_langtools_javac11": {
|
"java_tools_langtools_javac11": {
|
||||||
|
@ -512,20 +512,20 @@
|
||||||
"https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11_v2.zip"
|
"https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11_v2.zip"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"java_tools_linux-v11.6.zip": {
|
"java_tools_linux-v11.7.1.zip": {
|
||||||
"name": "java_tools_linux-v11.6.zip",
|
"name": "java_tools_linux-v11.7.1.zip",
|
||||||
"sha256": "15da4f84a7d39cd179acf3035d9def638eea6ba89a0ed8f4e8a8e6e1d6c8e328",
|
"sha256": "f78077f0c043d0d13c82de0ee4a99753e66bb18ec46e3601fa2a10e7f26798a8",
|
||||||
"urls": [
|
"urls": [
|
||||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.6/java_tools_linux-v11.6.zip",
|
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools_linux-v11.7.1.zip",
|
||||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.6/java_tools_linux-v11.6.zip"
|
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools_linux-v11.7.1.zip"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"java_tools_windows-v11.6.zip": {
|
"java_tools_windows-v11.7.1.zip": {
|
||||||
"name": "java_tools_windows-v11.6.zip",
|
"name": "java_tools_windows-v11.7.1.zip",
|
||||||
"sha256": "939f9d91f0df02851bbad8f5b1d26d24011329394cafe5668c1234e31ac2a1f7",
|
"sha256": "a7086734866505292ee4c206328c73c6af127e69bd51b98c9c186ae4b9b6d2db",
|
||||||
"urls": [
|
"urls": [
|
||||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.6/java_tools_windows-v11.6.zip",
|
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools_windows-v11.7.1.zip",
|
||||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.6/java_tools_windows-v11.6.zip"
|
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools_windows-v11.7.1.zip"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"jekyll_tree_0_17_1": {
|
"jekyll_tree_0_17_1": {
|
||||||
|
@ -1172,10 +1172,10 @@
|
||||||
"patch_cmds_win": [
|
"patch_cmds_win": [
|
||||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||||
],
|
],
|
||||||
"sha256": "f17ee54582b61f1ebd84c8fa2c54df796914cfbaac3cb821fb1286b55b080bc0",
|
"sha256": "4d6d388b54ad3b9aa35b30dd67af8d71c4c240df8cfb5000bbec67bdd5c53a73",
|
||||||
"urls": [
|
"urls": [
|
||||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.6/java_tools_darwin-v11.6.zip",
|
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools_darwin-v11.7.1.zip",
|
||||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.6/java_tools_darwin-v11.6.zip"
|
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools_darwin-v11.7.1.zip"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"remote_java_tools_for_testing": {
|
"remote_java_tools_for_testing": {
|
||||||
|
@ -1190,10 +1190,10 @@
|
||||||
"patch_cmds_win": [
|
"patch_cmds_win": [
|
||||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||||
],
|
],
|
||||||
"sha256": "a7ac5922ee01e8b8fcb546ffc264ef314d0a0c679328b7fa4c432e5f54a86067",
|
"sha256": "2eede49b2d80135e0ea22180f63df26db2ed4b795c1c041b25cc653d6019fbec",
|
||||||
"urls": [
|
"urls": [
|
||||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.6/java_tools-v11.6.zip",
|
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools-v11.7.1.zip",
|
||||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.6/java_tools-v11.6.zip"
|
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools-v11.7.1.zip"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"remote_java_tools_linux": {
|
"remote_java_tools_linux": {
|
||||||
|
@ -1218,10 +1218,10 @@
|
||||||
"patch_cmds_win": [
|
"patch_cmds_win": [
|
||||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||||
],
|
],
|
||||||
"sha256": "15da4f84a7d39cd179acf3035d9def638eea6ba89a0ed8f4e8a8e6e1d6c8e328",
|
"sha256": "f78077f0c043d0d13c82de0ee4a99753e66bb18ec46e3601fa2a10e7f26798a8",
|
||||||
"urls": [
|
"urls": [
|
||||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.6/java_tools_linux-v11.6.zip",
|
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools_linux-v11.7.1.zip",
|
||||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.6/java_tools_linux-v11.6.zip"
|
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools_linux-v11.7.1.zip"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"remote_java_tools_test": {
|
"remote_java_tools_test": {
|
||||||
|
@ -1236,10 +1236,10 @@
|
||||||
"patch_cmds_win": [
|
"patch_cmds_win": [
|
||||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||||
],
|
],
|
||||||
"sha256": "a7ac5922ee01e8b8fcb546ffc264ef314d0a0c679328b7fa4c432e5f54a86067",
|
"sha256": "2eede49b2d80135e0ea22180f63df26db2ed4b795c1c041b25cc653d6019fbec",
|
||||||
"urls": [
|
"urls": [
|
||||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.6/java_tools-v11.6.zip",
|
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools-v11.7.1.zip",
|
||||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.6/java_tools-v11.6.zip"
|
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools-v11.7.1.zip"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"remote_java_tools_test_darwin": {
|
"remote_java_tools_test_darwin": {
|
||||||
|
@ -1254,10 +1254,10 @@
|
||||||
"patch_cmds_win": [
|
"patch_cmds_win": [
|
||||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||||
],
|
],
|
||||||
"sha256": "f17ee54582b61f1ebd84c8fa2c54df796914cfbaac3cb821fb1286b55b080bc0",
|
"sha256": "4d6d388b54ad3b9aa35b30dd67af8d71c4c240df8cfb5000bbec67bdd5c53a73",
|
||||||
"urls": [
|
"urls": [
|
||||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.6/java_tools_darwin-v11.6.zip",
|
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools_darwin-v11.7.1.zip",
|
||||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.6/java_tools_darwin-v11.6.zip"
|
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools_darwin-v11.7.1.zip"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"remote_java_tools_test_linux": {
|
"remote_java_tools_test_linux": {
|
||||||
|
@ -1272,10 +1272,10 @@
|
||||||
"patch_cmds_win": [
|
"patch_cmds_win": [
|
||||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||||
],
|
],
|
||||||
"sha256": "15da4f84a7d39cd179acf3035d9def638eea6ba89a0ed8f4e8a8e6e1d6c8e328",
|
"sha256": "f78077f0c043d0d13c82de0ee4a99753e66bb18ec46e3601fa2a10e7f26798a8",
|
||||||
"urls": [
|
"urls": [
|
||||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.6/java_tools_linux-v11.6.zip",
|
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools_linux-v11.7.1.zip",
|
||||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.6/java_tools_linux-v11.6.zip"
|
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools_linux-v11.7.1.zip"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"remote_java_tools_test_windows": {
|
"remote_java_tools_test_windows": {
|
||||||
|
@ -1290,10 +1290,10 @@
|
||||||
"patch_cmds_win": [
|
"patch_cmds_win": [
|
||||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||||
],
|
],
|
||||||
"sha256": "939f9d91f0df02851bbad8f5b1d26d24011329394cafe5668c1234e31ac2a1f7",
|
"sha256": "a7086734866505292ee4c206328c73c6af127e69bd51b98c9c186ae4b9b6d2db",
|
||||||
"urls": [
|
"urls": [
|
||||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.6/java_tools_windows-v11.6.zip",
|
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools_windows-v11.7.1.zip",
|
||||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.6/java_tools_windows-v11.6.zip"
|
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools_windows-v11.7.1.zip"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"remote_java_tools_windows": {
|
"remote_java_tools_windows": {
|
||||||
|
@ -1318,10 +1318,10 @@
|
||||||
"patch_cmds_win": [
|
"patch_cmds_win": [
|
||||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||||
],
|
],
|
||||||
"sha256": "939f9d91f0df02851bbad8f5b1d26d24011329394cafe5668c1234e31ac2a1f7",
|
"sha256": "a7086734866505292ee4c206328c73c6af127e69bd51b98c9c186ae4b9b6d2db",
|
||||||
"urls": [
|
"urls": [
|
||||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.6/java_tools_windows-v11.6.zip",
|
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools_windows-v11.7.1.zip",
|
||||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.6/java_tools_windows-v11.6.zip"
|
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools_windows-v11.7.1.zip"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"remotejdk11_linux": {
|
"remotejdk11_linux": {
|
||||||
|
|
Loading…
Reference in a new issue