Merge pull request #40525 from mboes/bazel-0.13

Bazel 0.13

authored by xeji and committed by GitHub 25fa3fff 246b7c4b

+10 -7
+10 -7
pkgs/development/tools/build-managers/bazel/default.nix
··· 8 8 9 9 stdenv.mkDerivation rec { 10 10 11 - version = "0.12.0"; 11 + version = "0.13.0"; 12 12 13 13 meta = with stdenv.lib; { 14 14 homepage = "https://github.com/bazelbuild/bazel/"; 15 15 description = "Build tool that builds code quickly and reliably"; 16 16 license = licenses.asl20; 17 - maintainers = [ maintainers.philandstuff ]; 17 + maintainers = [ maintainers.mboes ]; 18 18 platforms = platforms.linux ++ platforms.darwin; 19 19 }; 20 20 ··· 22 22 23 23 src = fetchurl { 24 24 url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; 25 - sha256 = "3b3e7dc76d145046fdc78db7cac9a82bc8939d3b291e53a7ce85315feb827754"; 25 + sha256 = "143nd9dmw2x88azf8spinl2qnvw9m8lqlqc765l9q2v6hi807sc2"; 26 26 }; 27 27 28 28 sourceRoot = "."; ··· 64 64 --replace /bin/bash ${customBash}/bin/bash \ 65 65 --replace /usr/bin/env ${coreutils}/bin/env 66 66 done 67 + # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. 68 + substituteInPlace scripts/bootstrap/compile.sh \ 69 + --replace /bin/sh ${customBash}/bin/bash 67 70 echo "build --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\"" >> .bazelrc 68 71 echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc 69 72 echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc 70 73 echo "build --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\"" >> .bazelrc 71 - sed -i -e "348 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh 72 - sed -i -e "348 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh 73 - sed -i -e "348 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh 74 - sed -i -e "348 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh 74 + sed -i -e "366 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh 75 + sed -i -e "366 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh 76 + sed -i -e "366 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh 77 + sed -i -e "366 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh 75 78 patchShebangs . 76 79 ''; 77 80