public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #63532 from guibou/bazel_027

Browse Source 
bazel: 0.26.1 -> 0.27.0
This commit is contained in:
Florian Klink 2019-06-24 22:28:40 +02:00 committed by GitHub
commit 097a63a5db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 104 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
pkgs/development/tools/build-managers/bazel/default.nix
View File

@ -2,7 +2,7 @@
# this package (through the fixpoint glass) # this package (through the fixpoint glass)
, bazel , bazel
, lr, xe, zip, unzip, bash, writeCBin, coreutils , lr, xe, zip, unzip, bash, writeCBin, coreutils
, which, python, gawk, gnused, gnutar, gnugrep, gzip, findutils , which, gawk, gnused, gnutar, gnugrep, gzip, findutils
# updater # updater
, python3, writeScript , python3, writeScript
# Apple dependencies # Apple dependencies
@ -14,38 +14,41 @@
# Always assume all markers valid (don't redownload dependencies). # Always assume all markers valid (don't redownload dependencies).
# Also, don't clean up environment variables. # Also, don't clean up environment variables.
, enableNixHacks ? false , enableNixHacks ? false
, gcc-unwrapped
, autoPatchelfHook
}: }:
let let
version = "0.26.1"; version = "0.27.0";
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 = "000ny51hwnjyizm1md4w8q7m832jhf3c767pgbvg6nc7h67lzsf0"; sha256 = "0yn662dzgfr8ls4avfl12k5sr4f210bab12wml18bh4sjlxhs263";
}; };
# Update with `eval $(nix-build -A bazel.updater)`, # Update with `eval $(nix-build -A bazel.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 = srcDeps = lib.attrsets.attrValues srcDepsSet;
srcDepsSet =
let let
srcs = (builtins.fromJSON (builtins.readFile ./src-deps.json)); srcs = (builtins.fromJSON (builtins.readFile ./src-deps.json));
toFetchurl = d: fetchurl { toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl {
name = d.name; name = d.name;
urls = d.urls; urls = d.urls;
sha256 = d.sha256; sha256 = d.sha256;
}; });
in map toFetchurl [ in builtins.listToAttrs (map toFetchurl [
srcs.desugar_jdk_libs srcs.desugar_jdk_libs
srcs.io_bazel_skydoc srcs.io_bazel_skydoc
srcs.bazel_skylib srcs.bazel_skylib
srcs.io_bazel_rules_sass srcs.io_bazel_rules_sass
(if stdenv.hostPlatform.isDarwin (if stdenv.hostPlatform.isDarwin
then srcs.${"java_tools_javac10_darwin-v3.2.zip"} then srcs.${"java_tools_javac11_darwin-v2.0.zip"}
else srcs.${"java_tools_javac10_linux-v3.2.zip"}) else srcs.${"java_tools_javac11_linux-v2.0.zip"})
srcs.${"coverage_output_generator-v1.0.zip"} srcs.${"coverage_output_generator-v1.0.zip"}
srcs.build_bazel_rules_nodejs srcs.build_bazel_rules_nodejs
srcs.${"android_tools_pkg-0.2.tar.gz"} srcs.${"android_tools_pkg-0.4.tar.gz"}
]; ]);
distDir = runCommand "bazel-deps" {} '' distDir = runCommand "bazel-deps" {} ''
mkdir -p $out mkdir -p $out
@ -87,6 +90,33 @@ let
platforms = lib.platforms.linux ++ lib.platforms.darwin; platforms = lib.platforms.linux ++ lib.platforms.darwin;
# This repository is fetched by bazel at runtime
# however it contains prebuilt java binaries, with wrong interpreter
# and libraries path.
# We prefetch it, patch it, and override it in a global bazelrc.
system = if stdenv.hostPlatform.isDarwin
then "darwin" else "linux";
remote_java_tools = stdenv.mkDerivation {
name = "remote_java_tools_${system}";
src = srcDepsSet."java_tools_javac11_${system}-v2.0.zip";
nativeBuildInputs = [ autoPatchelfHook unzip ];
buildInputs = [ gcc-unwrapped ];
sourceRoot = ".";
buildPhase = ''
mkdir $out;
'';
installPhase = ''
cp -Ra * $out/
touch $out/WORKSPACE
'';
};
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bazel-${version}"; name = "bazel-${version}";
@ -117,6 +147,7 @@ stdenv.mkDerivation rec {
runLocal = name: attrs: script: runCommandCC name ({ runLocal = name: attrs: script: runCommandCC name ({
preferLocalBuild = true; preferLocalBuild = true;
meta.platforms = platforms; meta.platforms = platforms;
buildInputs = [ python3 ];
} // attrs) script; } // attrs) script;
# bazel wants to extract itself into $install_dir/install every time it runs, # bazel wants to extract itself into $install_dir/install every time it runs,
@ -258,8 +289,8 @@ stdenv.mkDerivation rec {
# Substitute python's stub shebang to plain python path. (see TODO add pr URL) # Substitute python's stub shebang to plain python path. (see TODO add pr URL)
# See also `postFixup` where python is added to $out/nix-support # See also `postFixup` where python is added to $out/nix-support
substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt\ substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt\
--replace "/usr/bin/env python" "${python}/bin/python" \ --replace "/usr/bin/env python" "${python3}/bin/python" \
--replace "NIX_STORE_PYTHON_PATH" "${python}/bin/python" \ --replace "NIX_STORE_PYTHON_PATH" "${python3}/bin/python" \
# md5sum is part of coreutils # md5sum is part of coreutils
sed -i 's|/sbin/md5|md5sum|' \ sed -i 's|/sbin/md5|md5sum|' \
@ -275,6 +306,11 @@ stdenv.mkDerivation rec {
--replace /bin/true ${coreutils}/bin/true --replace /bin/true ${coreutils}/bin/true
done done
# bazel test runner include references to /bin/bash
substituteInPlace tools/build_rules/test_rules.bzl \
--replace /bin/bash ${customBash}/bin/bash
# Fixup scripts that generate scripts. Not fixed up by patchShebangs below. # Fixup scripts that generate scripts. Not fixed up by patchShebangs below.
substituteInPlace scripts/bootstrap/compile.sh \ substituteInPlace scripts/bootstrap/compile.sh \
--replace /bin/bash ${customBash}/bin/bash --replace /bin/bash ${customBash}/bin/bash
@ -323,19 +359,26 @@ stdenv.mkDerivation rec {
mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash
patchShebangs . patchShebangs .
# bazel reads its system bazelrc in /etc
# override this path to a builtin one
substituteInPlace \
src/main/cpp/option_processor.cc \
--replace BAZEL_SYSTEM_BAZELRC_PATH "\"$out/etc/bazelrc\""
''; '';
in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches
+ genericPatches; + genericPatches;
buildInputs = [ buildInputs = [
buildJdk buildJdk
python3
]; ];
# when a command can’t be found in a bazel build, you might also # when a command can’t be found in a bazel build, you might also
# need to add it to `defaultShellPath`. # need to add it to `defaultShellPath`.
nativeBuildInputs = [ nativeBuildInputs = [
zip zip
python python3
unzip unzip
makeWrapper makeWrapper
which which
@ -375,20 +418,40 @@ stdenv.mkDerivation rec {
wrapProgram "$out/bin/bazel" --add-flags --server_javabase="${runJdk}" wrapProgram "$out/bin/bazel" --add-flags --server_javabase="${runJdk}"
# generates the system bazelrc
# warning: the name of the repository depends on the system, hence
# the reference to .name
mkdir $out/etc
echo "build --override_repository=${remote_java_tools.name}=${remote_java_tools}" > $out/etc/bazelrc
# shell completion files # shell completion files
mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions
mv ./bazel_src/output/bazel-complete.bash $out/share/bash-completion/completions/bazel mv ./bazel_src/output/bazel-complete.bash $out/share/bash-completion/completions/bazel
cp ./bazel_src/scripts/zsh_completion/_bazel $out/share/zsh/site-functions/ cp ./bazel_src/scripts/zsh_completion/_bazel $out/share/zsh/site-functions/
''; '';
# Temporarily disabling for now. A new approach is needed for this derivation as Bazel doInstallCheck = true;
# accesses the internet during the tests which fails in a sandbox.
doInstallCheck = false;
installCheckPhase = '' installCheckPhase = ''
export TEST_TMPDIR=$(pwd) export TEST_TMPDIR=$(pwd)
tar xf ${srcDepsSet.io_bazel_skydoc} -C $TEST_TMPDIR
mv $(ls | grep skydoc-) io_bazel_skydoc
tar xf ${srcDepsSet.bazel_skylib} -C $TEST_TMPDIR
mv $(ls | grep bazel-skylib-) bazel_skylib
tar xf ${srcDepsSet.io_bazel_rules_sass} -C $TEST_TMPDIR
mv $(ls | grep rules_sass-) rules_sass
unzip ${srcDepsSet.build_bazel_rules_nodejs} -d $TEST_TMPDIR
mv rules_nodejs-0.16.2 build_bazel_rules_nodejs
hello_test () { hello_test () {
$out/bin/bazel test \ $out/bin/bazel test \
--override_repository=io_bazel_skydoc=$TEST_TMPDIR/io_bazel_skydoc \
--override_repository=bazel_skylib=$TEST_TMPDIR/bazel_skylib \
--override_repository=io_bazel_rules_sass=$TEST_TMPDIR/rules_sass \
--override_repository=build_bazel_rules_nodejs=$TEST_TMPDIR/build_bazel_rules_nodejs \
--test_output=errors \ --test_output=errors \
--java_toolchain='${javaToolchain}' \ --java_toolchain='${javaToolchain}' \
examples/cpp:hello-success_test \ examples/cpp:hello-success_test \
@ -424,7 +487,7 @@ stdenv.mkDerivation rec {
echo "${customBash} ${defaultShellPath}" >> $out/nix-support/depends echo "${customBash} ${defaultShellPath}" >> $out/nix-support/depends
# The templates get tar’d up into a .jar, # The templates get tar’d up into a .jar,
# so nix can’t detect python is needed in the runtime closure # so nix can’t detect python is needed in the runtime closure
echo "${python}" >> $out/nix-support/depends echo "${python3}" >> $out/nix-support/depends
''; '';
dontStrip = true; dontStrip = true;

39
pkgs/development/tools/build-managers/bazel/src-deps.json
View File

@ -23,11 +23,11 @@
"https://github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz" "https://github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz"
] ]
}, },
"android_tools_pkg-0.2.tar.gz": { "android_tools_pkg-0.4.tar.gz": {
"name": "android_tools_pkg-0.2.tar.gz", "name": "android_tools_pkg-0.4.tar.gz",
"sha256": "04f85f2dd049e87805511e3babc5cea3f5e72332b1627e34f3a5461cc38e815f", "sha256": "331e7706f2bcae8a68057d8ddd3e3f1574bca26c67c65802fc4a8ac6164fa912",
"urls": [ "urls": [
"https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.2.tar.gz" "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.4.tar.gz"
] ]
}, },
"bazel_j2objc": { "bazel_j2objc": {
@ -134,25 +134,25 @@
"https://github.com/bazelbuild/skydoc/archive/2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz" "https://github.com/bazelbuild/skydoc/archive/2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz"
] ]
}, },
"java_tools_javac10_darwin-v3.2.zip": { "java_tools_javac11_darwin-v2.0.zip": {
"name": "java_tools_javac10_darwin-v3.2.zip", "name": "java_tools_javac11_darwin-v2.0.zip",
"sha256": "1437327179b4284f7082cee0bdc3328f040e62fc5cc59c32f6824b8c520e2b7b", "sha256": "0ceb0c9ff91256fe33508306bc9cd9e188dcca38df78e70839d426bdaef67a38",
"urls": [ "urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac10/v3.2/java_tools_javac10_darwin-v3.2.zip" "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v2.0/java_tools_javac11_darwin-v2.0.zip"
] ]
}, },
"java_tools_javac10_linux-v3.2.zip": { "java_tools_javac11_linux-v2.0.zip": {
"name": "java_tools_javac10_linux-v3.2.zip", "name": "java_tools_javac11_linux-v2.0.zip",
"sha256": "b93e7c556b01815afb6c248aa73f06b7ec912805bde8898eedac1e20d08f2e67", "sha256": "074d624fb34441df369afdfd454e75dba821d5d54932fcfee5ba598d17dc1b99",
"urls": [ "urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac10/v3.2/java_tools_javac10_linux-v3.2.zip" "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v2.0/java_tools_javac11_linux-v2.0.zip"
] ]
}, },
"java_tools_javac10_windows-v3.2.zip": { "java_tools_javac11_windows-v2.0.zip": {
"name": "java_tools_javac10_windows-v3.2.zip", "name": "java_tools_javac11_windows-v2.0.zip",
"sha256": "86d3cc7fa0dc91ccb8f78ae3af8440fe459177e22062043ee4b83d55e6b7dfb0", "sha256": "2c3fc0ce7d30d60e26f4b8a36e2eadcf9e6a9d5a51b667d3d13b78db53b24251",
"urls": [ "urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac10/v3.2/java_tools_javac10_windows-v3.2.zip" "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v2.0/java_tools_javac11_windows-v2.0.zip"
] ]
}, },
"java_tools_langtools_javac10": { "java_tools_langtools_javac10": {
@ -162,6 +162,13 @@
"https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk10.zip" "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk10.zip"
] ]
}, },
"java_tools_langtools_javac11": {
"name": "java_tools_langtools_javac11",
"sha256": "128a63f39d3f828a761f6afcfe3c6115279336a72ea77f60d7b3acf1841c9acb",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11.zip"
]
},
"java_tools_langtools_javac9": { "java_tools_langtools_javac9": {
"name": "java_tools_langtools_javac9", "name": "java_tools_langtools_javac9",
"sha256": "3b6bbc47256acf2f61883901e2d4e3f9b292f5fe154a6912b928805de24cb864", "sha256": "3b6bbc47256acf2f61883901e2d4e3f9b292f5fe154a6912b928805de24cb864",