diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-06-24 19:13:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-24 19:13:57 +0200 |
| commit | 25fa3fff8170f8c775cacdce64fbb89bb82e38dc (patch) | |
| tree | 1606ff3dca77a31c8d2de105cb7e25c748613156 /pkgs | |
| parent | 246b7c4b118c4534953a8e0488ad199dfe68fc38 (diff) | |
| parent | 6f03c349ed4dff3f5d7e3ae7df141b0db954eb38 (diff) | |
| download | nixlib-25fa3fff8170f8c775cacdce64fbb89bb82e38dc.tar nixlib-25fa3fff8170f8c775cacdce64fbb89bb82e38dc.tar.gz nixlib-25fa3fff8170f8c775cacdce64fbb89bb82e38dc.tar.bz2 nixlib-25fa3fff8170f8c775cacdce64fbb89bb82e38dc.tar.lz nixlib-25fa3fff8170f8c775cacdce64fbb89bb82e38dc.tar.xz nixlib-25fa3fff8170f8c775cacdce64fbb89bb82e38dc.tar.zst nixlib-25fa3fff8170f8c775cacdce64fbb89bb82e38dc.zip | |
Merge pull request #40525 from mboes/bazel-0.13
Bazel 0.13
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/build-managers/bazel/default.nix | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 941004234011..1dac9513f948 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { - version = "0.12.0"; + version = "0.13.0"; meta = with stdenv.lib; { homepage = "https://github.com/bazelbuild/bazel/"; description = "Build tool that builds code quickly and reliably"; license = licenses.asl20; - maintainers = [ maintainers.philandstuff ]; + maintainers = [ maintainers.mboes ]; platforms = platforms.linux ++ platforms.darwin; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "3b3e7dc76d145046fdc78db7cac9a82bc8939d3b291e53a7ce85315feb827754"; + sha256 = "143nd9dmw2x88azf8spinl2qnvw9m8lqlqc765l9q2v6hi807sc2"; }; sourceRoot = "."; @@ -64,14 +64,17 @@ stdenv.mkDerivation rec { --replace /bin/bash ${customBash}/bin/bash \ --replace /usr/bin/env ${coreutils}/bin/env done + # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. + substituteInPlace scripts/bootstrap/compile.sh \ + --replace /bin/sh ${customBash}/bin/bash echo "build --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\"" >> .bazelrc echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc echo "build --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\"" >> .bazelrc - sed -i -e "348 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "348 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "348 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "348 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "366 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "366 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "366 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "366 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh patchShebangs . ''; |