From 00fdb28e49aa913ee029971c15e4e3a04c21cb79 Mon Sep 17 00:00:00 2001
From: Claudio Bley <cbley@exa-online.de>
Date: Thu, 26 Nov 2020 22:21:44 +0100
Subject: [PATCH 1/7] pythonPackages36.{dm-sonnet, tensorflow-probability}: Use
bazel 0.26 for building
* use the same bazel version as tensorflow 1
(this makes using the `incompatible_disable_deprecated_attr_params` flag unnecessary)
---
pkgs/development/python-modules/dm-sonnet/default.nix | 10 ++++------
.../python-modules/tensorflow-probability/default.nix | 3 +++
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix
index 627f8eedaeb..f465ac200d4 100644
--- a/pkgs/development/python-modules/dm-sonnet/default.nix
+++ b/pkgs/development/python-modules/dm-sonnet/default.nix
@@ -1,5 +1,6 @@
{ lib
, fetchFromGitHub
+, bazel_0_26
, buildBazelPackage
, buildPythonPackage
, git
@@ -19,6 +20,8 @@ let
# first build all binaries and generate setup.py using bazel
bazel-build = buildBazelPackage {
+ bazel = bazel_0_26;
+
name = "dm-sonnet-bazel-${version}";
src = fetchFromGitHub {
@@ -36,14 +39,9 @@ let
bazelTarget = ":install";
fetchAttrs = {
- sha256 = "1dka5nap3d28n18pn3wp5xsi4x3z02h1j8rcjdvi3y6dbqjwdw0v";
+ sha256 = "09dzxs2v5wpiaxrz7qj257q1fbx0gxwbk0jyx58n81m5kys7yj9k";
};
- bazelFlags = [
- # https://github.com/deepmind/sonnet/issues/134
- "--incompatible_disable_deprecated_attr_params=false"
- ];
-
buildAttrs = {
preBuild = ''
patchShebangs .
diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix
index 91880562eb3..1daaac6ae7e 100644
--- a/pkgs/development/python-modules/tensorflow-probability/default.nix
+++ b/pkgs/development/python-modules/tensorflow-probability/default.nix
@@ -1,6 +1,7 @@
{ lib
, fetchFromGitHub
, fetchpatch
+, bazel_0_26
, buildBazelPackage
, buildPythonPackage
, python
@@ -26,6 +27,8 @@ let
# first build all binaries and generate setup.py using bazel
bazel-wheel = buildBazelPackage {
+ bazel = bazel_0_26;
+
name = "${pname}-${version}-py2.py3-none-any.whl";
src = fetchFromGitHub {
From 71cda4f1118d41db29e50077fb8611f9ac472b8e Mon Sep 17 00:00:00 2001
From: Claudio Bley <cbley@exa-online.de>
Date: Mon, 30 Nov 2020 10:14:42 +0100
Subject: [PATCH 2/7] bazel: 3.3.1 -> 3.7.1
* remove python-shebang patch since it was integrated upstream[1]
[1]: https://github.com/bazelbuild/bazel/pull/11535/files
---
.../virtualization/gvisor/default.nix | 2 +-
.../python-modules/tensorflow/default.nix | 4 +-
.../tools/bazel-watcher/default.nix | 2 +-
.../bazel/bazel-remote/default.nix | 2 +-
.../build-managers/bazel/bazel_3/default.nix | 20 +-
.../bazel/bazel_3/python-shebang.patch | 20 -
.../bazel/bazel_3/src-deps.json | 344 +++++++++++-------
.../build-managers/bazel/update-srcDeps.py | 3 +
8 files changed, 230 insertions(+), 167 deletions(-)
delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_3/python-shebang.patch
diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix
index fd001d598ad..1fca347bf9c 100644
--- a/pkgs/applications/virtualization/gvisor/default.nix
+++ b/pkgs/applications/virtualization/gvisor/default.nix
@@ -76,7 +76,7 @@ in buildBazelPackage rec {
rm -f "$bazelOut"/java.log "$bazelOut"/java.log.*
'';
- sha256 = "0myffqywbvqhax995z55jymwnwyxmp13r27kpbc7wb5fk9s4skvr";
+ sha256 = "033lnznqbw8a5y765prb60k5r7sicjvg63a2h24r2z6qkr2jn70b";
};
buildAttrs = {
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 9f64a689e2b..7407fca2aec 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -288,9 +288,9 @@ let
fetchAttrs = {
# cudaSupport causes fetch of ncclArchive, resulting in different hashes
sha256 = if cudaSupport then
- "0vyy1hv0jy5pqwvnc8pxb9isgnbw07c4a4d4wn61db00np114crz"
+ "0zqn16s1j7p8l1q4857lsk14pk18vy0yg52rnigzs0kz9wijkjp0"
else
- "0vczv5f9s4dxgwdkmf1y9b9ybh5d3y1nllqhb5q8aj9kq73izyn9";
+ "18dbfbmwryapi7cf5rhks1m7a3bayd3gh9idm92vkr19sz6yjm3l";
};
buildAttrs = {
diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix
index 94efcc9be06..183ea15e361 100644
--- a/pkgs/development/tools/bazel-watcher/default.nix
+++ b/pkgs/development/tools/bazel-watcher/default.nix
@@ -56,7 +56,7 @@ buildBazelPackage rec {
sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
'';
- sha256 = "0yl5rs6y1xifxjfsa9zv8bjcwiky7rxk9y3rmi01pqpsm7ik12a9";
+ sha256 = "1rvshgpcnazjxza3zd2zjnjphpv8vvwgx9syd7fhzgz7iba0i2jw";
};
buildAttrs = {
diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
index 80c949c1efb..8bb4968e4de 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
@@ -64,7 +64,7 @@ buildBazelPackage rec {
sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
'';
- sha256 = "1m7fmb03lirffxx04ck73bn5zwaji7zdwhlqq8s1c6pgp755d3vi";
+ sha256 = "0j5wrsxxychhdkdr8knr0p0yiaf2vyxq6vx06a0fry9g3gqvf1md";
};
buildAttrs = {
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
index 0b5a7362ded..fd7bfecb0a5 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
@@ -25,11 +25,11 @@
}:
let
- version = "3.3.1";
+ version = "3.7.1";
src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
- sha256 = "0ir796kl8r9hpr3li26qsdy1z2lx2bv82zmk4a2s7q64clyg9wg0";
+ sha256 = "01q3kc4f8g08dw3nvinyn2qmd2ymf8n0h9iy26802syz0mclw969";
};
# Update with `eval $(nix-build -A bazel.updater)`,
@@ -49,13 +49,15 @@ let
srcs.io_bazel_rules_sass
srcs.platforms
# `bazel query` wants all of these to be available regardless of platform.
- srcs."java_tools_javac11_darwin-v8.0.zip"
- srcs."java_tools_javac11_linux-v8.0.zip"
- srcs."java_tools_javac11_windows-v8.0.zip"
- srcs."coverage_output_generator-v2.1.zip"
+ srcs."java_tools_javac11_darwin-v10.0.zip"
+ srcs."java_tools_javac11_linux-v10.0.zip"
+ srcs."java_tools_javac11_windows-v10.0.zip"
+ srcs."coverage_output_generator-v2.5.zip"
srcs.build_bazel_rules_nodejs
- srcs."android_tools_pkg-0.19.0rc1.tar.gz"
+ srcs."android_tools_pkg-0.19.0rc3.tar.gz"
srcs."bazel-toolchains-3.1.0.tar.gz"
+ srcs."com_github_grpc_grpc"
+ srcs.upb
srcs.rules_pkg
srcs.rules_cc
srcs.rules_java
@@ -112,7 +114,7 @@ let
remote_java_tools = stdenv.mkDerivation {
name = "remote_java_tools_${system}";
- src = srcDepsSet."java_tools_javac11_${system}-v8.0.zip";
+ src = srcDepsSet."java_tools_javac11_${system}-v10.0.zip";
nativeBuildInputs = [ autoPatchelfHook unzip ];
buildInputs = [ gcc-unwrapped ];
@@ -169,8 +171,6 @@ stdenv.mkDerivation rec {
sourceRoot = ".";
patches = [
- ./python-shebang.patch
-
# On Darwin, the last argument to gcc is coming up as an empty string. i.e: ''
# This is breaking the build of any C target. This patch removes the last
# argument if it's found to be an empty string.
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/python-shebang.patch b/pkgs/development/tools/build-managers/bazel/bazel_3/python-shebang.patch
deleted file mode 100644
index 75547264fcc..00000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_3/python-shebang.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java 2020-05-25 14:46:01.608403087 +0200
-+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java 2020-05-25 14:50:52.881398320 +0200
-@@ -238,14 +238,15 @@
- // TODO(#8685): Remove this special-case handling as part of making the proper shebang a
- // property of the Python toolchain configuration.
- String pythonExecutableName = OS.getCurrent() == OS.OPENBSD ? "python3" : "python";
-+ String pythonShebang = "#!/usr/bin/env " + pythonExecutableName;
- ruleContext.registerAction(
- new SpawnAction.Builder()
- .addInput(zipFile)
- .addOutput(executable)
- .setShellCommand(
- shExecutable,
-- "echo '#!/usr/bin/env "
-- + pythonExecutableName
-+ "echo '"
-+ + pythonShebang
- + "' | cat - "
- + zipFile.getExecPathString()
- + " > "
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json
index 4007a77b065..96553d9d885 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json
+++ b/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json
@@ -39,14 +39,6 @@
"https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"
]
},
- "8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip": {
- "name": "8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip",
- "sha256": "1d4dbbd1e1e9b57d40bb0ade51c9e882da7658d5bfbf22bbd15b68e7879d761f",
- "urls": [
- "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip",
- "https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip"
- ]
- },
"97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz": {
"name": "97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz",
"sha256": "602e7161d9195e50246177e7c55b2f39950a9cf7366f74ed5f22fd45750cd208",
@@ -55,6 +47,14 @@
"https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz"
]
},
+ "9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz": {
+ "name": "9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz",
+ "sha256": "61d0417abd60e65ed589c9deee7c124fe76a4106831f6ad39464e1525cef1454",
+ "urls": [
+ "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz",
+ "https://github.com/protocolbuffers/upb/archive/9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz"
+ ]
+ },
"android_tools_for_testing": {
"name": "android_tools_for_testing",
"patch_cmds": [
@@ -65,14 +65,22 @@
"patch_cmds_win": [
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
],
- "sha256": "761e997a9055fe5e2b70aba8d64e78d4c2113feafaa8ac81909cb63e403f3087",
- "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc1.tar.gz"
+ "sha256": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837",
+ "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz"
},
- "android_tools_pkg-0.19.0rc1.tar.gz": {
- "name": "android_tools_pkg-0.19.0rc1.tar.gz",
- "sha256": "761e997a9055fe5e2b70aba8d64e78d4c2113feafaa8ac81909cb63e403f3087",
+ "android_tools_pkg-0.19.0rc3.tar.gz": {
+ "name": "android_tools_pkg-0.19.0rc3.tar.gz",
+ "sha256": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837",
"urls": [
- "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc1.tar.gz"
+ "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz"
+ ]
+ },
+ "b1c40e1de81913a3c40e5948f78719c28152486d.zip": {
+ "name": "b1c40e1de81913a3c40e5948f78719c28152486d.zip",
+ "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip",
+ "https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip"
]
},
"bazel-toolchains-3.1.0.tar.gz": {
@@ -143,6 +151,21 @@
"https://github.com/bazelbuild/rules_nodejs/releases/download/1.3.0/rules_nodejs-1.3.0.tar.gz"
]
},
+ "com_github_grpc_grpc": {
+ "name": "com_github_grpc_grpc",
+ "patch_args": [
+ "-p1"
+ ],
+ "patches": [
+ "//third_party/grpc:grpc_1.26.0.patch"
+ ],
+ "sha256": "2fcb7f1ab160d6fd3aaade64520be3e5446fc4c6fa7ba6581afdc4e26094bd81",
+ "strip_prefix": "grpc-1.26.0",
+ "urls": [
+ "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.26.0.tar.gz",
+ "https://github.com/grpc/grpc/archive/v1.26.0.tar.gz"
+ ]
+ },
"com_google_googletest": {
"name": "com_google_googletest",
"sha256": "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb",
@@ -166,20 +189,20 @@
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
],
"patches": [
- "//third_party/protobuf:3.11.3.patch"
+ "//third_party/protobuf:3.13.0.patch"
],
- "sha256": "cf754718b0aa945b00550ed7962ddc167167bd922b842199eeb6505e6f344852",
- "strip_prefix": "protobuf-3.11.3",
+ "sha256": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a",
+ "strip_prefix": "protobuf-3.13.0",
"urls": [
- "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.11.3.tar.gz",
- "https://github.com/protocolbuffers/protobuf/archive/v3.11.3.tar.gz"
+ "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz",
+ "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz"
]
},
- "coverage_output_generator-v2.1.zip": {
- "name": "coverage_output_generator-v2.1.zip",
- "sha256": "96ac6bc9b9fbc67b532bcae562da1642409791e6a4b8e522f04946ee5cc3ff8e",
+ "coverage_output_generator-v2.5.zip": {
+ "name": "coverage_output_generator-v2.5.zip",
+ "sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d",
"urls": [
- "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.1.zip"
+ "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip"
]
},
"desugar_jdk_libs": {
@@ -199,6 +222,14 @@
"https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.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"
+ ]
+ },
"io_bazel_rules_sass": {
"name": "io_bazel_rules_sass",
"sha256": "c78be58f5e0a29a04686b628cf54faaee0094322ae0ac99da5a8a8afca59a647",
@@ -217,25 +248,25 @@
"https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz"
]
},
- "java_tools_javac11_darwin-v8.0.zip": {
- "name": "java_tools_javac11_darwin-v8.0.zip",
- "sha256": "e0291e8956ac295143da4a673ca50727f7376665ee82b649a4ee810b64ff76c1",
+ "java_tools_javac11_darwin-v10.0.zip": {
+ "name": "java_tools_javac11_darwin-v10.0.zip",
+ "sha256": "64e5de2175dfccb96831573946b80d106edf3801d9db38b564514bf3581d466b",
"urls": [
- "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_darwin-v8.0.zip"
+ "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_darwin-v10.0.zip"
]
},
- "java_tools_javac11_linux-v8.0.zip": {
- "name": "java_tools_javac11_linux-v8.0.zip",
- "sha256": "c24aef916cc5a8e9f6d53db1f93c54fe5790a58996a1099592e1dfe992acc81e",
+ "java_tools_javac11_linux-v10.0.zip": {
+ "name": "java_tools_javac11_linux-v10.0.zip",
+ "sha256": "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1",
"urls": [
- "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_linux-v8.0.zip"
+ "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_linux-v10.0.zip"
]
},
- "java_tools_javac11_windows-v8.0.zip": {
- "name": "java_tools_javac11_windows-v8.0.zip",
- "sha256": "444c391977e50af4e10549a28d021069d2ca7745a0e7b9b968a7b153fe3ea430",
+ "java_tools_javac11_windows-v10.0.zip": {
+ "name": "java_tools_javac11_windows-v10.0.zip",
+ "sha256": "d2f62af8daa0a3d55789b605f6582e37038329c64843337c71e64515468e55c4",
"urls": [
- "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_windows-v8.0.zip"
+ "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_windows-v10.0.zip"
]
},
"java_tools_langtools_javac11": {
@@ -245,13 +276,6 @@
"https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11_v2.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"
- ]
- },
"openjdk11_darwin_archive": {
"build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
"name": "openjdk11_darwin_archive",
@@ -279,31 +303,31 @@
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip"
]
},
- "openjdk12_darwin_archive": {
+ "openjdk14_darwin_archive": {
"build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
- "name": "openjdk12_darwin_archive",
- "sha256": "67ca9d285056132ebb19fa237a14affda52132142e1171fe1c20e18974b3b8a5",
- "strip_prefix": "zulu12.2.3-ca-jdk12.0.1-macosx_x64",
+ "name": "openjdk14_darwin_archive",
+ "sha256": "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd",
+ "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-macosx_x64",
"urls": [
- "https://mirror.bazel.build/openjdk/azul-zulu12.2.3-ca-jdk12.0.1/zulu12.2.3-ca-jdk12.0.1-macosx_x64.tar.gz"
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz"
]
},
- "openjdk12_linux_archive": {
+ "openjdk14_linux_archive": {
"build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
- "name": "openjdk12_linux_archive",
- "sha256": "529c99841d69e11a85aea967ccfb9d0fd40b98c5b68dbe1d059002655e0a9c13",
- "strip_prefix": "zulu12.2.3-ca-jdk12.0.1-linux_x64",
+ "name": "openjdk14_linux_archive",
+ "sha256": "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa",
+ "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-linux_x64",
"urls": [
- "https://mirror.bazel.build/openjdk/azul-zulu12.2.3-ca-jdk12.0.1/zulu12.2.3-ca-jdk12.0.1-linux_x64.tar.gz"
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz"
]
},
- "openjdk12_windows_archive": {
+ "openjdk14_windows_archive": {
"build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
- "name": "openjdk12_windows_archive",
- "sha256": "cf28404c23c3aa1115363ba6e796c30580a768e1d7d6681a7d053e516008e00d",
- "strip_prefix": "zulu12.2.3-ca-jdk12.0.1-win_x64",
+ "name": "openjdk14_windows_archive",
+ "sha256": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284",
+ "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-win_x64",
"urls": [
- "https://mirror.bazel.build/openjdk/azul-zulu12.2.3-ca-jdk12.0.1/zulu12.2.3-ca-jdk12.0.1-win_x64.zip"
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip"
]
},
"openjdk_linux": {
@@ -351,8 +375,17 @@
"name": "openjdk_linux_ppc64le_vanilla",
"sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a",
"urls": [
- "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz",
- "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz"
+ "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz",
+ "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz"
+ ]
+ },
+ "openjdk_linux_s390x_vanilla": {
+ "downloaded_file_path": "adoptopenjdk-s390x-vanilla.tar.gz",
+ "name": "openjdk_linux_s390x_vanilla",
+ "sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059",
+ "urls": [
+ "https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz",
+ "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz"
]
},
"openjdk_linux_vanilla": {
@@ -430,9 +463,9 @@
"patch_cmds_win": [
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
],
- "sha256": "96ac6bc9b9fbc67b532bcae562da1642409791e6a4b8e522f04946ee5cc3ff8e",
+ "sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d",
"urls": [
- "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.1.zip"
+ "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip"
]
},
"remote_java_tools_darwin_for_testing": {
@@ -445,10 +478,10 @@
"patch_cmds_win": [
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
],
- "sha256": "e0291e8956ac295143da4a673ca50727f7376665ee82b649a4ee810b64ff76c1",
+ "sha256": "64e5de2175dfccb96831573946b80d106edf3801d9db38b564514bf3581d466b",
"urls": [
- "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_darwin-v8.0.zip",
- "https://github.com/bazelbuild/java_tools/releases/download/javac11_v8.0/java_tools_javac11_darwin-v8.0.zip"
+ "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_darwin-v10.0.zip",
+ "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_darwin-v10.0.zip"
]
},
"remote_java_tools_javac11_test_darwin": {
@@ -461,9 +494,9 @@
"patch_cmds_win": [
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
],
- "sha256": "e0291e8956ac295143da4a673ca50727f7376665ee82b649a4ee810b64ff76c1",
+ "sha256": "64e5de2175dfccb96831573946b80d106edf3801d9db38b564514bf3581d466b",
"urls": [
- "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_darwin-v8.0.zip"
+ "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_darwin-v10.0.zip"
]
},
"remote_java_tools_javac11_test_linux": {
@@ -476,9 +509,9 @@
"patch_cmds_win": [
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
],
- "sha256": "c24aef916cc5a8e9f6d53db1f93c54fe5790a58996a1099592e1dfe992acc81e",
+ "sha256": "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1",
"urls": [
- "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_linux-v8.0.zip"
+ "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_linux-v10.0.zip"
]
},
"remote_java_tools_javac11_test_windows": {
@@ -491,54 +524,9 @@
"patch_cmds_win": [
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
],
- "sha256": "444c391977e50af4e10549a28d021069d2ca7745a0e7b9b968a7b153fe3ea430",
+ "sha256": "d2f62af8daa0a3d55789b605f6582e37038329c64843337c71e64515468e55c4",
"urls": [
- "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_windows-v8.0.zip"
- ]
- },
- "remote_java_tools_javac12_test_darwin": {
- "name": "remote_java_tools_javac12_test_darwin",
- "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": "54df966e7583bafe659e39b4103a4ce934201d969de638d071ada07d8e0c1a3a",
- "urls": [
- "https://mirror.bazel.build/bazel_java_tools/releases/javac12/v3.0/java_tools_javac12_darwin-v3.0.zip"
- ]
- },
- "remote_java_tools_javac12_test_linux": {
- "name": "remote_java_tools_javac12_test_linux",
- "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": "3997ee9a57b095748f1c0d084839fab2fbc72504aeb7b37b1f71c31738d330e3",
- "urls": [
- "https://mirror.bazel.build/bazel_java_tools/releases/javac12/v3.0/java_tools_javac12_linux-v3.0.zip"
- ]
- },
- "remote_java_tools_javac12_test_windows": {
- "name": "remote_java_tools_javac12_test_windows",
- "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": "cfad1718dad1fed12816748eed27ab30b9ea1268c8ce9940acf3b5b7d82d483d",
- "urls": [
- "https://mirror.bazel.build/bazel_java_tools/releases/javac12/v3.0/java_tools_javac12_windows-v3.0.zip"
+ "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_windows-v10.0.zip"
]
},
"remote_java_tools_linux_for_testing": {
@@ -551,10 +539,10 @@
"patch_cmds_win": [
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
],
- "sha256": "c24aef916cc5a8e9f6d53db1f93c54fe5790a58996a1099592e1dfe992acc81e",
+ "sha256": "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1",
"urls": [
- "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_linux-v8.0.zip",
- "https://github.com/bazelbuild/java_tools/releases/download/javac11_v8.0/java_tools_javac11_linux-v8.0.zip"
+ "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_linux-v10.0.zip",
+ "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_linux-v10.0.zip"
]
},
"remote_java_tools_windows_for_testing": {
@@ -567,10 +555,10 @@
"patch_cmds_win": [
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
],
- "sha256": "444c391977e50af4e10549a28d021069d2ca7745a0e7b9b968a7b153fe3ea430",
+ "sha256": "d2f62af8daa0a3d55789b605f6582e37038329c64843337c71e64515468e55c4",
"urls": [
- "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_windows-v8.0.zip",
- "https://github.com/bazelbuild/java_tools/releases/download/javac11_v8.0/java_tools_javac11_windows-v8.0.zip"
+ "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_windows-v10.0.zip",
+ "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_windows-v10.0.zip"
]
},
"remotejdk11_linux_aarch64_for_testing": {
@@ -621,8 +609,26 @@
"sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a",
"strip_prefix": "jdk-11.0.7+10",
"urls": [
- "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz",
- "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz"
+ "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz",
+ "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz"
+ ]
+ },
+ "remotejdk11_linux_s390x_for_testing": {
+ "build_file": "@local_jdk//:BUILD.bazel",
+ "name": "remotejdk11_linux_s390x_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": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059",
+ "strip_prefix": "jdk-11.0.7+10",
+ "urls": [
+ "https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz",
+ "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz"
]
},
"remotejdk11_macos_for_testing": {
@@ -659,6 +665,57 @@
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip"
]
},
+ "remotejdk14_linux_for_testing": {
+ "build_file": "@local_jdk//:BUILD.bazel",
+ "name": "remotejdk14_linux_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": "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa",
+ "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-linux_x64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz"
+ ]
+ },
+ "remotejdk14_macos_for_testing": {
+ "build_file": "@local_jdk//:BUILD.bazel",
+ "name": "remotejdk14_macos_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": "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd",
+ "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-macosx_x64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz"
+ ]
+ },
+ "remotejdk14_win_for_testing": {
+ "build_file": "@local_jdk//:BUILD.bazel",
+ "name": "remotejdk14_win_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": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284",
+ "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-win_x64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip"
+ ]
+ },
"rules_cc": {
"name": "rules_cc",
"patch_cmds": [
@@ -669,11 +726,11 @@
"patch_cmds_win": [
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
],
- "sha256": "1d4dbbd1e1e9b57d40bb0ade51c9e882da7658d5bfbf22bbd15b68e7879d761f",
- "strip_prefix": "rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0",
+ "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd",
+ "strip_prefix": "rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d",
"urls": [
- "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip",
- "https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip"
+ "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip",
+ "https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip"
]
},
"rules_java": {
@@ -742,12 +799,35 @@
"https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz"
]
},
- "v3.11.3.tar.gz": {
- "name": "v3.11.3.tar.gz",
- "sha256": "cf754718b0aa945b00550ed7962ddc167167bd922b842199eeb6505e6f344852",
+ "upb": {
+ "name": "upb",
+ "patch_args": [
+ "-p1"
+ ],
+ "patches": [
+ "//third_party/grpc:upb_gcc10_fix.patch"
+ ],
+ "sha256": "61d0417abd60e65ed589c9deee7c124fe76a4106831f6ad39464e1525cef1454",
+ "strip_prefix": "upb-9effcbcb27f0a665f9f345030188c0b291e32482",
"urls": [
- "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.11.3.tar.gz",
- "https://github.com/protocolbuffers/protobuf/archive/v3.11.3.tar.gz"
+ "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz",
+ "https://github.com/protocolbuffers/upb/archive/9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz"
+ ]
+ },
+ "v1.26.0.tar.gz": {
+ "name": "v1.26.0.tar.gz",
+ "sha256": "2fcb7f1ab160d6fd3aaade64520be3e5446fc4c6fa7ba6581afdc4e26094bd81",
+ "urls": [
+ "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.26.0.tar.gz",
+ "https://github.com/grpc/grpc/archive/v1.26.0.tar.gz"
+ ]
+ },
+ "v3.13.0.tar.gz": {
+ "name": "v3.13.0.tar.gz",
+ "sha256": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a",
+ "urls": [
+ "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz",
+ "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz"
]
},
"zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz": {
diff --git a/pkgs/development/tools/build-managers/bazel/update-srcDeps.py b/pkgs/development/tools/build-managers/bazel/update-srcDeps.py
index 52d40e0f94e..4105aeeb11b 100755
--- a/pkgs/development/tools/build-managers/bazel/update-srcDeps.py
+++ b/pkgs/development/tools/build-managers/bazel/update-srcDeps.py
@@ -47,6 +47,9 @@ def winsdk_configure(*args, **kw): pass
def register_local_rc_exe_toolchains(*args, **kw): pass
def register_toolchains(*args, **kw): pass
def debian_deps(): pass
+def grpc_deps(): pass
+def grpc_extra_deps(): pass
+def bazel_skylib_workspace(): pass
# execute the WORKSPACE like it was python code in this module,
# using all the function stubs from above.
From 6d8c431eb0e9513fd7274bf9db4e72cdeb5a8375 Mon Sep 17 00:00:00 2001
From: Claudio Bley <cbley@exa-online.de>
Date: Sat, 19 Dec 2020 21:10:51 +0100
Subject: [PATCH 3/7] bazel: 3.7.1 -> 3.7.2
* update sha256 for gvisor, tensorflow{,WithCuda}, bazel-watcher, bazel-remote
and envoy
---
pkgs/applications/virtualization/gvisor/default.nix | 2 +-
pkgs/development/python-modules/tensorflow/default.nix | 4 ++--
pkgs/development/tools/bazel-watcher/default.nix | 2 +-
.../tools/build-managers/bazel/bazel-remote/default.nix | 2 +-
.../tools/build-managers/bazel/bazel_3/default.nix | 4 ++--
pkgs/servers/http/envoy/default.nix | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix
index 1fca347bf9c..56760c293eb 100644
--- a/pkgs/applications/virtualization/gvisor/default.nix
+++ b/pkgs/applications/virtualization/gvisor/default.nix
@@ -76,7 +76,7 @@ in buildBazelPackage rec {
rm -f "$bazelOut"/java.log "$bazelOut"/java.log.*
'';
- sha256 = "033lnznqbw8a5y765prb60k5r7sicjvg63a2h24r2z6qkr2jn70b";
+ sha256 = "0fhmlq0d2317gwhma2mz1anb69j4chybk90j71j88wpgw1hxbk34";
};
buildAttrs = {
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 7407fca2aec..0e2df1a4678 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -288,9 +288,9 @@ let
fetchAttrs = {
# cudaSupport causes fetch of ncclArchive, resulting in different hashes
sha256 = if cudaSupport then
- "0zqn16s1j7p8l1q4857lsk14pk18vy0yg52rnigzs0kz9wijkjp0"
+ "1i7z2a7bc2q1vn1h9nx1xc6g1r1cby2xvbcs20fj9h6c2fgaw9j4"
else
- "18dbfbmwryapi7cf5rhks1m7a3bayd3gh9idm92vkr19sz6yjm3l";
+ "0s8q5rxq8abr50c5jpwv96ncfc0k8jw7w70ri8viqy031g9v9v45";
};
buildAttrs = {
diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix
index 183ea15e361..bc3a2828f6c 100644
--- a/pkgs/development/tools/bazel-watcher/default.nix
+++ b/pkgs/development/tools/bazel-watcher/default.nix
@@ -56,7 +56,7 @@ buildBazelPackage rec {
sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
'';
- sha256 = "1rvshgpcnazjxza3zd2zjnjphpv8vvwgx9syd7fhzgz7iba0i2jw";
+ sha256 = "0rwwjjj6zaj4hdcbsbp0di53xn6203r2vgpddhdrp8iph9ab60cg";
};
buildAttrs = {
diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
index 8bb4968e4de..ee22ce98b24 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
@@ -64,7 +64,7 @@ buildBazelPackage rec {
sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
'';
- sha256 = "0j5wrsxxychhdkdr8knr0p0yiaf2vyxq6vx06a0fry9g3gqvf1md";
+ sha256 = "1vijh3nl30n8k6xlx6in92pzs70x15akbqiqalk8apgvphvdz8vy";
};
buildAttrs = {
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
index fd7bfecb0a5..b73beddf23a 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
@@ -25,11 +25,11 @@
}:
let
- version = "3.7.1";
+ version = "3.7.2";
src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
- sha256 = "01q3kc4f8g08dw3nvinyn2qmd2ymf8n0h9iy26802syz0mclw969";
+ sha256 = "1cfrbs23lg0jnl22ddylx3clcjw7bdpbix7r5lqibab346s5n9fy";
};
# Update with `eval $(nix-build -A bazel.updater)`,
diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix
index c297ea38245..3a453528151 100644
--- a/pkgs/servers/http/envoy/default.nix
+++ b/pkgs/servers/http/envoy/default.nix
@@ -56,7 +56,7 @@ buildBazelPackage rec {
];
fetchAttrs = {
- sha256 = "sha256-mct7anzErY9eSujZyGORfRJqzAO9XuFAv04DS8VRZKM=";
+ sha256 = "0q72c2zrl5vc8afkhkwyalb2h0mxn3133d4b9z4gag0p95wbwgc0";
dontUseCmakeConfigure = true;
preInstall = ''
# Strip out the path to the build location (by deleting the comment line).
From e22cf985205f8d220fda4ec104fe5d0fd9e20536 Mon Sep 17 00:00:00 2001
From: Claudio Bley <cbley@exa-online.de>
Date: Mon, 1 Feb 2021 21:36:36 +0100
Subject: [PATCH 4/7] bazel: Use jdk11_headless to build bazel
Use the same JDK for building bazel and for its runtime.
Effectively, the former `toolchain_hostjdk8` java toolchain has been deprecated
and should no longer be used (in newer bazel)[1]:
```
# Deprecated, do not use.
# It will be removed after migration to Java toolchain resolution.
default_java_toolchain(
name = "toolchain_hostjdk8",
...
)
```
[1]: https://github.com/bazelbuild/bazel/blob/4fc48680653a71aacbfd555436ba8f9a0742d3d9/tools/jdk/BUILD.tools#L384-L387
---
.../tools/build-managers/bazel/bazel_3/default.nix | 2 +-
pkgs/top-level/all-packages.nix | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
index b73beddf23a..5e5686ea20d 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
@@ -100,7 +100,7 @@ let
[ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip file zip ];
# Java toolchain used for the build and tests
- javaToolchain = "@bazel_tools//tools/jdk:toolchain_host${buildJdkName}";
+ javaToolchain = "@bazel_tools//tools/jdk:toolchain_${buildJdkName}";
platforms = lib.platforms.linux ++ lib.platforms.darwin;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f823ee0f8be..b09a40a550b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11677,8 +11677,8 @@ in
bazel_3 = callPackage ../development/tools/build-managers/bazel/bazel_3 {
inherit (darwin) cctools;
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
- buildJdk = jdk8_headless;
- buildJdkName = "jdk8";
+ buildJdk = jdk11_headless;
+ buildJdkName = "java11";
runJdk = jdk11_headless;
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
bazel_self = bazel_3;
From 5f71a0ff5df37536d07d494b1847f7f21f078e8c Mon Sep 17 00:00:00 2001
From: Claudio Bley <cbley@exa-online.de>
Date: Mon, 1 Feb 2021 21:56:51 +0100
Subject: [PATCH 5/7] bazel: Fix build on darwin
* use default stdenv (clang 7)
* add no-arc.patch to make the xcode_locate tool compile without libarc-lite
* remove the `-mmacosx-version-min=10.9` flag from the bootstrap compile script
---
.../build-managers/bazel/bazel_3/default.nix | 10 ++++++
.../build-managers/bazel/bazel_3/no-arc.patch | 34 +++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 +-
3 files changed, 45 insertions(+), 1 deletion(-)
create mode 100644 pkgs/development/tools/build-managers/bazel/bazel_3/no-arc.patch
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
index 5e5686ea20d..37afb129867 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
@@ -176,6 +176,14 @@ stdenv.mkDerivation rec {
# argument if it's found to be an empty string.
../trim-last-argument-to-gcc-if-empty.patch
+ # On Darwin, using clang 6 to build fails because of a linker error (see #105573),
+ # but using clang 7 fails because libarclite_macosx.a cannot be found when linking
+ # the xcode_locator tool.
+ # This patch removes using the -fobjc-arc compiler option and makes the code
+ # compile without automatic reference counting. Caveat: this leaks memory, but
+ # we neglect this fact.
+ ./no-arc.patch
+
# --experimental_strict_action_env (which may one day become the default
# see bazelbuild/bazel#2574) hardcodes the default
# action environment to a non hermetic value (e.g. "/usr/local/bin").
@@ -371,6 +379,8 @@ stdenv.mkDerivation rec {
src/tools/xcode/stdredirect/BUILD \
tools/osx/BUILD
+ substituteInPlace scripts/bootstrap/compile.sh --replace ' -mmacosx-version-min=10.9' ""
+
# nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead
sed -i -e "/#include <pthread\/spawn.h>/i #include <dispatch/dispatch.h>" src/main/cpp/blaze_util_darwin.cc
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/no-arc.patch b/pkgs/development/tools/build-managers/bazel/bazel_3/no-arc.patch
new file mode 100644
index 00000000000..012e613c2f1
--- /dev/null
+++ b/pkgs/development/tools/build-managers/bazel/bazel_3/no-arc.patch
@@ -0,0 +1,34 @@
+--- a/tools/osx/xcode_locator.m 2020-12-10 13:27:29.000000000 +0100
++++ b/tools/osx/xcode_locator.m 2021-02-01 09:09:32.159557051 +0100
+@@ -21,10 +21,6 @@
+ // 6,6.4,6.4.1 = 6.4.1
+ // 6.3,6.3.0 = 6.3
+
+-#if !defined(__has_feature) || !__has_feature(objc_arc)
+-#error "This file requires ARC support."
+-#endif
+-
+ #import <CoreServices/CoreServices.h>
+ #import <Foundation/Foundation.h>
+
+--- a/tools/osx/xcode_configure.bzl 1980-01-01 01:00:00.000000000 +0100
++++ b/tools/osx/xcode_configure.bzl 2021-02-01 09:36:57.773418444 +0100
+@@ -123,7 +123,6 @@
+ "macosx",
+ "clang",
+ "-mmacosx-version-min=10.9",
+- "-fobjc-arc",
+ "-framework",
+ "CoreServices",
+ "-framework",
+--- a/tools/osx/BUILD 2021-02-01 11:01:02.191659553 +0100
++++ b/tools/osx/BUILD 2021-02-01 11:04:29.735071019 +0100
+@@ -27,7 +27,7 @@
+ ])
+
+ DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """
+- /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -fobjc-arc -framework CoreServices \
++ /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -framework CoreServices \
+ -framework Foundation -o $@ $<
+ """
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b09a40a550b..76cdb38c1f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11680,7 +11680,7 @@ in
buildJdk = jdk11_headless;
buildJdkName = "java11";
runJdk = jdk11_headless;
- stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
+ stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
bazel_self = bazel_3;
};
From a6e18b4758071f4a2f0cd98d11a9a4438335f817 Mon Sep 17 00:00:00 2001
From: Claudio Bley <claudio.bley@gmail.com>
Date: Tue, 2 Feb 2021 10:16:20 +0100
Subject: [PATCH 6/7] bazel: Reword comment that memory leaks are acceptable
Co-authored-by: Greg Roodt <groodt@gmail.com>
---
pkgs/development/tools/build-managers/bazel/bazel_3/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
index 37afb129867..41ae9ce2112 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
@@ -181,7 +181,7 @@ stdenv.mkDerivation rec {
# the xcode_locator tool.
# This patch removes using the -fobjc-arc compiler option and makes the code
# compile without automatic reference counting. Caveat: this leaks memory, but
- # we neglect this fact.
+ # we accept this fact because xcode_locator is only a short-lived process used during the build.
./no-arc.patch
# --experimental_strict_action_env (which may one day become the default
From a42d59b2085439835038d8a8594c4845a17df2ba Mon Sep 17 00:00:00 2001
From: Claudio Bley <cbley@exa-online.de>
Date: Wed, 3 Feb 2021 10:59:19 +0100
Subject: [PATCH 7/7] bazel-remote: Mark as broken on Darwin
It currently fails during compilation because C++ standard
header files cannot be found.
---
.../tools/build-managers/bazel/bazel-remote/default.nix | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
index ee22ce98b24..1dfe784ec25 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
@@ -4,6 +4,7 @@
, git
, go
, lib
+, stdenv
}:
buildBazelPackage rec {
@@ -86,5 +87,6 @@ buildBazelPackage rec {
license = licenses.asl20;
maintainers = [ maintainers.uri-canva ];
platforms = platforms.darwin ++ platforms.linux;
+ broken = stdenv.isDarwin;
};
}