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

bazel: Use --distdir for prefetched repositories

Browse Source 
--distdir is now used in the installCheckPhase for prefetched
  repositories. That's simpler, more robust and easier to extend in
  the future.

Note that `name` argument of fetchurl was removed because it changed
the basename of the generated file and bazel uses this basename for
its cache behavior.
This commit is contained in:
Guillaume Bouchard 2019-07-11 17:10:55 +02:00
parent 95395fbf54
commit d363da72cc
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,6 @@ let
let let
srcs = (builtins.fromJSON (builtins.readFile ./src-deps.json)); srcs = (builtins.fromJSON (builtins.readFile ./src-deps.json));
toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl { toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl {
name = d.name;
urls = d.urls; urls = d.urls;
sha256 = d.sha256; sha256 = d.sha256;
}); });
@ -339,8 +338,8 @@ stdenv.mkDerivation rec {
# add nix environment vars to .bazelrc # add nix environment vars to .bazelrc
cat >> .bazelrc <<EOF cat >> .bazelrc <<EOF
build --experimental_distdir=${distDir} build --distdir=${distDir}
fetch --experimental_distdir=${distDir} fetch --distdir=${distDir}
build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')" build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')"
build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')" build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')"
build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')" build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')"
@ -456,24 +455,8 @@ stdenv.mkDerivation rec {
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 --distdir=${distDir} \
--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 \