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
This commit is contained in:
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user