forked from mirrors/nixpkgs
bazel: 0.27.0 -> 0.28.0
This commit is contained in:
Guillaume Bouchard
parent
d363da72cc
commit
950da6263f
|
|
@ -19,11 +19,11 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "0.27.0";
|
||||
version = "0.28.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
|
||||
sha256 = "0yn662dzgfr8ls4avfl12k5sr4f210bab12wml18bh4sjlxhs263";
|
||||
sha256 = "26ad8cdadd413b8432cf46d9fc3801e8db85d9922f85dd8a7f5a92fec876557f";
|
||||
};
|
||||
|
||||
# Update with `eval $(nix-build -A bazel.updater)`,
|
||||
|
|
@ -41,12 +41,13 @@ let
|
|||
srcs.io_bazel_skydoc
|
||||
srcs.bazel_skylib
|
||||
srcs.io_bazel_rules_sass
|
||||
srcs.platforms
|
||||
(if stdenv.hostPlatform.isDarwin
|
||||
then srcs.${"java_tools_javac11_darwin-v2.0.zip"}
|
||||
else srcs.${"java_tools_javac11_linux-v2.0.zip"})
|
||||
srcs.${"coverage_output_generator-v1.0.zip"}
|
||||
srcs.build_bazel_rules_nodejs
|
||||
srcs.${"android_tools_pkg-0.4.tar.gz"}
|
||||
srcs.${"android_tools_pkg-0.7.tar.gz"}
|
||||
]);
|
||||
|
||||
distDir = runCommand "bazel-deps" {} ''
|
||||
|
|
@ -331,6 +332,11 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace tools/build_rules/test_rules.bzl \
|
||||
--replace /bin/bash ${customBash}/bin/bash
|
||||
|
||||
for i in $(find tools/cpp/ -type f)
|
||||
do
|
||||
substituteInPlace $i \
|
||||
--replace /bin/bash ${customBash}/bin/bash
|
||||
done
|
||||
|
||||
# Fixup scripts that generate scripts. Not fixed up by patchShebangs below.
|
||||
substituteInPlace scripts/bootstrap/compile.sh \
|
||||
|
|
|
|||
|
|
@ -7,12 +7,20 @@
|
|||
"https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip"
|
||||
]
|
||||
},
|
||||
"2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz": {
|
||||
"name": "2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz",
|
||||
"sha256": "4a1318fed4831697b83ce879b3ab70ae09592b167e5bda8edaff45132d1c3b3f",
|
||||
"1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz": {
|
||||
"name": "1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz",
|
||||
"sha256": "3ca1b3d453a977aeda60dd335feb812771addfd0d0c61751b34b9681aa4d6534",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz",
|
||||
"https://github.com/bazelbuild/skydoc/archive/2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz"
|
||||
"https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz",
|
||||
"https://github.com/bazelbuild/skydoc/archive/1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz"
|
||||
]
|
||||
},
|
||||
"441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip": {
|
||||
"name": "441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip",
|
||||
"sha256": "a07fe5e75964361885db725039c2ba673f0ee0313d971ae4f50c9b18cd28b0b5",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip",
|
||||
"https://github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip"
|
||||
]
|
||||
},
|
||||
"8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz": {
|
||||
|
|
@ -23,11 +31,11 @@
|
|||
"https://github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz"
|
||||
]
|
||||
},
|
||||
"android_tools_pkg-0.4.tar.gz": {
|
||||
"name": "android_tools_pkg-0.4.tar.gz",
|
||||
"sha256": "331e7706f2bcae8a68057d8ddd3e3f1574bca26c67c65802fc4a8ac6164fa912",
|
||||
"android_tools_pkg-0.7.tar.gz": {
|
||||
"name": "android_tools_pkg-0.7.tar.gz",
|
||||
"sha256": "a8e48f2fdee2c34b31f45bd47ce050a75ac774f19e0a1f6694fa49fc11d88718",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.4.tar.gz"
|
||||
"https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.7.tar.gz"
|
||||
]
|
||||
},
|
||||
"bazel_j2objc": {
|
||||
|
|
@ -41,11 +49,11 @@
|
|||
},
|
||||
"bazel_rbe_toolchains": {
|
||||
"name": "bazel_rbe_toolchains",
|
||||
"sha256": "f575778fb1366718f5e1204200ecf35796c558998c15303945d351f0b42669e5",
|
||||
"strip_prefix": "bazel_rbe_toolchains-f50471a57cd05a313a953fa54756db6e8fd93673",
|
||||
"sha256": "e2b8644caa15235a488e831264e5dcb014e2cdf3b697319bc1e9d6b0fff0b4b9",
|
||||
"strip_prefix": "bazel_rbe_toolchains-01529a65d21abdf71635ff0c2472043a567ecded",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/buchgr/bazel_rbe_toolchains/archive/f50471a57cd05a313a953fa54756db6e8fd93673.tar.gz",
|
||||
"https://github.com/buchgr/bazel_rbe_toolchains/archive/f50471a57cd05a313a953fa54756db6e8fd93673.tar.gz"
|
||||
"https://mirror.bazel.build/github.com/buchgr/bazel_rbe_toolchains/archive/01529a65d21abdf71635ff0c2472043a567ecded.tar.gz",
|
||||
"https://github.com/buchgr/bazel_rbe_toolchains/archive/01529a65d21abdf71635ff0c2472043a567ecded.tar.gz"
|
||||
]
|
||||
},
|
||||
"bazel_skylib": {
|
||||
|
|
@ -127,11 +135,11 @@
|
|||
},
|
||||
"io_bazel_skydoc": {
|
||||
"name": "io_bazel_skydoc",
|
||||
"sha256": "4a1318fed4831697b83ce879b3ab70ae09592b167e5bda8edaff45132d1c3b3f",
|
||||
"strip_prefix": "skydoc-2d9566b21fbe405acf5f7bf77eda30df72a4744c",
|
||||
"sha256": "3ca1b3d453a977aeda60dd335feb812771addfd0d0c61751b34b9681aa4d6534",
|
||||
"strip_prefix": "skydoc-1ca560df1cf6e280f987af2f8d08a5edc7ac6b54",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz",
|
||||
"https://github.com/bazelbuild/skydoc/archive/2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz"
|
||||
"https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz",
|
||||
"https://github.com/bazelbuild/skydoc/archive/1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz"
|
||||
]
|
||||
},
|
||||
"java_tools_javac11_darwin-v2.0.zip": {
|
||||
|
|
@ -169,6 +177,13 @@
|
|||
"https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11.zip"
|
||||
]
|
||||
},
|
||||
"java_tools_langtools_javac12": {
|
||||
"name": "java_tools_langtools_javac12",
|
||||
"sha256": "99b107105165a91df82cd7cf82a8efb930d803fb7de1663cf7f780142104cd14",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk12.zip"
|
||||
]
|
||||
},
|
||||
"java_tools_langtools_javac9": {
|
||||
"name": "java_tools_langtools_javac9",
|
||||
"sha256": "3b6bbc47256acf2f61883901e2d4e3f9b292f5fe154a6912b928805de24cb864",
|
||||
|
|
@ -235,11 +250,27 @@
|
|||
]
|
||||
},
|
||||
"openjdk_linux_aarch64": {
|
||||
"downloaded_file_path": "zulu-linux-aarch64.tar.gz",
|
||||
"name": "openjdk_linux_aarch64",
|
||||
"sha256": "72e7843902b0395e2d30e1e9ad2a5f05f36a4bc62529828bcbc698d54aec6022",
|
||||
"sha256": "23c37c0c3a8fdcbc68e96e70ff5c5c020c14db76deaae9b547849afda4586e5e",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk.linaro.org/releases/jdk9-server-release-1708.tar.xz",
|
||||
"http://openjdk.linaro.org/releases/jdk9-server-release-1708.tar.xz"
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64-allmodules-c82eb4878c7dc829455caeb915affe36c89df06f-1561630858.tar.gz"
|
||||
]
|
||||
},
|
||||
"openjdk_linux_aarch64_minimal": {
|
||||
"downloaded_file_path": "zulu-linux-aarch64-minimal.tar.gz",
|
||||
"name": "openjdk_linux_aarch64_minimal",
|
||||
"sha256": "7af2583fe5ef0a781d4a9dca0c0160d42e7db1305ec1b66f98aa44c91cc875df",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64-minimal-c82eb4878c7dc829455caeb915affe36c89df06f-1561630858.tar.gz"
|
||||
]
|
||||
},
|
||||
"openjdk_linux_aarch64_vanilla": {
|
||||
"downloaded_file_path": "zulu-linux-aarch64-vanilla.tar.gz",
|
||||
"name": "openjdk_linux_aarch64_vanilla",
|
||||
"sha256": "3b0d91611b1bdc4d409afcf9eab4f0e7f4ae09f88fc01bd9f2b48954882ae69b",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz"
|
||||
]
|
||||
},
|
||||
"openjdk_linux_minimal": {
|
||||
|
|
@ -306,6 +337,15 @@
|
|||
"https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64.zip"
|
||||
]
|
||||
},
|
||||
"platforms": {
|
||||
"name": "platforms",
|
||||
"sha256": "a07fe5e75964361885db725039c2ba673f0ee0313d971ae4f50c9b18cd28b0b5",
|
||||
"strip_prefix": "platforms-441afe1bfdadd6236988e9cac159df6b5a9f5a98",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip",
|
||||
"https://github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip"
|
||||
]
|
||||
},
|
||||
"zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz": {
|
||||
"name": "zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz",
|
||||
"sha256": "57fad3602e74c79587901d6966d3b54ef32cb811829a2552163185d5064fe9b5",
|
||||
|
|
@ -369,6 +409,13 @@
|
|||
"https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64.zip"
|
||||
]
|
||||
},
|
||||
"zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz": {
|
||||
"name": "zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz",
|
||||
"sha256": "3b0d91611b1bdc4d409afcf9eab4f0e7f4ae09f88fc01bd9f2b48954882ae69b",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz"
|
||||
]
|
||||
},
|
||||
"zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz": {
|
||||
"name": "zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz",
|
||||
"sha256": "f27cb933de4f9e7fe9a703486cf44c84bc8e9f138be0c270c9e5716a32367e87",
|
||||
|
|
|
|||
Loading…
Reference in a new issue