Unverified Commit bbe0dbf7 authored by Uri Baghin's avatar Uri Baghin Committed by GitHub
Browse files

Merge pull request #227432 from dmivankov/bazel_5.4.1 

bazel_5: 5.4.0->5.4.1
parents 5ed204fd e0d1e77c

pkgs/build-support/build-bazel-package/default.nix

+3 −4
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ let 
        --output_user_root="$bazelUserRoot" \

        ${cmd} \

        --curses=no \

        -j $NIX_BUILD_CORES \

        "''${copts[@]}" \

        "''${host_copts[@]}" \

        "''${linkopts[@]}" \
@@ -131,7 +130,7 @@ stdenv.mkDerivation (fBuildAttrs // { 
            # https://github.com/bazelbuild/bazel/issues/6502

            "--loading_phase_threads=1"

            "$bazelFetchFlags"

          ];

          ] ++ (if fetchConfigured then ["--jobs" "$NIX_BUILD_CORES"] else []);

          targets = fFetchAttrs.bazelTargets ++ fFetchAttrs.bazelTestTargets;

        }

      }
@@ -252,14 +251,14 @@ stdenv.mkDerivation (fBuildAttrs // { 
      bazelCmd {

        cmd = "test";

        additionalFlags =

          ["--test_output=errors"] ++ fBuildAttrs.bazelTestFlags;

          ["--test_output=errors"] ++ fBuildAttrs.bazelTestFlags ++ ["--jobs" "$NIX_BUILD_CORES"];

        targets = fBuildAttrs.bazelTestTargets;

      }

    }

    ${

      bazelCmd {

        cmd = "build";

        additionalFlags = fBuildAttrs.bazelBuildFlags;

        additionalFlags = fBuildAttrs.bazelBuildFlags ++ ["--jobs" "$NIX_BUILD_CORES"];

        targets = fBuildAttrs.bazelTargets;

      }

    }

pkgs/development/python-modules/jaxlib/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -243,9 +243,9 @@ let 


      sha256 =

        if cudaSupport then

          "sha256-cgsiloW77p4+TKRrYequZ/UwKwfO2jsHKtZ+aA30H7E="

          "sha256-O6bM7Lc8eaFyO4Xzl5/hvBrbPioI+Yeqx9yNC97fvKk="

        else

          "sha256-D7WYG3YUaWq+4APYx8WpA191VVtoHG0fth3uEHXOeos=";

          "sha256-gLMJfJSQIdGGY2Ivx4IgDWg0hc+mxzlqY11CUkSWcjI=";

    };



    buildAttrs = {

pkgs/development/python-modules/tensorflow/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -394,11 +394,11 @@ let 
    fetchAttrs = {

      sha256 = {

      x86_64-linux = if cudaSupport

        then "sha256-rcTPOMoBfmKFuuCanMlhmtFtOQzOICfEXTZey/rQEdM="

        else "sha256-JGLH64F81xwSUl9RCWJhBLNRBQandImsVafEF5s+ap0=";

      aarch64-linux = "sha256-g6JUZQQalCTSjvAarkI7+gq13cPhFg/O9LPQDGNvrII=";

      x86_64-darwin = "sha256-7O0zPs+damAjWXZn5C5SSWBp35C8QX3y4kCM7tYkM7s=";

      aarch64-darwin = "sha256-US7uunEBDo2NKI9UHvgThbQ7rA05HjQlUthw0gIINaI=";

        then "sha256-lURiR0Ra4kynDXyfuONG+A7CpxnAsfKzIdFTExKzp1o="

        else "sha256-lDvRgj+UlaneRGZOO9UVCb6uyxcbRJfUhABf/sgKPi0=";

      aarch64-linux = "sha256-z2d45fqHz5HW+qkv3fR9hMg3sEwUzJfxF54vng85bHk=";

      x86_64-darwin = "sha256-AAvuz8o6ZRkaSYMgaep74lDDQcxOupDCX4vRaK/jnCU=";

      aarch64-darwin = "sha256-kexRSvfQqb92ZRuUqAO070RnUUBidAqghiA7Y8do9vc=";

      }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");

    };

pkgs/development/tools/bazel-watcher/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ buildBazelPackage rec { 
      rm -rf $bazelOut/external/com_google_protobuf

    '';



    sha256 = "sha256-le8IepS+IGVX45Gj1aicPjYOkuUA+VVUy/PEeKLNYss=";

    sha256 = "sha256-lC9e5Z2cxLAeWXkiFGmcB6aOaurMvwrP/k5jl3gCfAc=";

  };



  buildAttrs = {

pkgs/development/tools/build-managers/bazel/bazel_5/default.nix

+10 −6
Original line number Diff line number Diff line
@@ -24,16 +24,19 @@ 
}:



let

  version = "5.4.0";

  version = "5.4.1";

  sourceRoot = ".";



  src = fetchurl {

    url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";

    hash = "sha256-ocYtm8tOAxBt3wt72WGWuiRuHJt6k12vjZvtqLvcuKE=";

    hash = "sha256-3P9pNXVqp6yk/Fabsr0m4VN/Cx9tG9pfKyAPqDXMUH8=";

  };



  # Update with `eval $(nix-build -A bazel_5.updater)`,

  # then add new dependencies from the dict in ./src-deps.json as required.

  # Update with

  # 1. export BAZEL_SELF=$(nix-build -A bazel_5)

  # 2. update version and hash for sources above

  # 3. `eval $(nix-build -A bazel_5.updater)`

  # 4. add new dependencies from the dict in ./src-deps.json if required by failing build

  srcDeps = lib.attrsets.attrValues srcDepsSet;

  srcDepsSet =

    let
@@ -324,8 +327,8 @@ stdenv.mkDerivation rec { 
    #!${runtimeShell}

    (cd "${src_for_updater}" &&

        BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \

        "${bazel_self}"/bin/bazel \

            query 'kind(http_archive, //external:all) + kind(http_file, //external:all) + kind(distdir_tar, //external:all) + kind(git_repository, //external:all)' \

        "$BAZEL_SELF"/bin/bazel \

            query 'kind(http_archive, //external:*) + kind(http_file, //external:*) + kind(distdir_tar, //external:*) + kind(git_repository, //external:*)' \

            --loading_phase_threads=1 \

            --output build) \

    | "${python3}"/bin/python3 "${./update-srcDeps.py}" \
@@ -619,6 +622,7 @@ stdenv.mkDerivation rec { 
    }



    cd ./bazel_src

    rm .bazelversion # this doesn't necessarily match the version we built



    # test whether $WORKSPACE_ROOT/tools/bazel works