Merge pull request #200033 from divanorama/bazel_5.3.2_2

bazel_5: 5.2.0 -> 5.3.2
This commit is contained in:
Uri Baghin 2023-01-10 16:40:17 +11:00 committed by GitHub
commit b2d9a04cfd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 16 deletions

View file

@ -234,11 +234,13 @@ let
fetchAttrs = {
sha256 =
if cudaSupport then
"sha256-Z9GDWGv+1YFyJjudyshZfeRJsKShoA1kIbNR3h3GxPQ="
else if stdenv.isDarwin then
"sha256-i3wiJHD4+pgTvDMhnYiQo9pdxxKItgYnc4/4wGt2NXM="
else
"sha256-liRxmjwm0OmVMfgoGXx+nGBdW2fzzP/d4zmK6A59HAM=";
"sha256-FO3mvxr+c3kWOhIRRdJ0gBOHrPr2LKrtjZvYaPp8Xu0="
else {
x86_64-linux = "sha256-s4fJhjxr9Nj8EMfNFoKDE68AVN7ETsvuuCZ4bJVS1Eo=";
aarch64-linux = "sha256-MgkQ8BwIP77dwbYyEyb59WUcOE7jWthHcDJZFNceS4o=";
x86_64-darwin = "sha256-xF36ctkzH/LGvKhrcrqVDz5tUqFnYsFaOzjf3aJUTtU=";
aarch64-darwin = "sha256-/C6HUTHvRd+3LL4repJWWQq+2UXgO5za4xXZhhNxNrM=";
}.${stdenv.system} or (throw "unsupported system ${stdenv.system}");
};
buildAttrs = {

View file

@ -372,11 +372,11 @@ let
fetchAttrs = {
sha256 = {
x86_64-linux = if cudaSupport
then "sha256-SudzMTxfifKJJso6haCgOD2dXeAhYSXHA2nzq1ErTHg="
else "sha256-bwZwK24DlUevN5gIdKmBkq1dJpn0i2H4hq+IN77BzjE=";
aarch64-linux = "sha256-ZbCNZSHF9of+KGTNEqFdKQ44MVNto/rTyo2XEsKXISg=";
x86_64-darwin = "sha256-ZfZQjLdqo8VVlfKfkdolvSHQvKe4IbQSLc/4cNzHr3E=";
aarch64-darwin = "sha256-u+ODHAZDlGe06PUWId4sNKyl60vhAPMd01jMm2EvN8E=";
then "sha256-8J3tVd32KKSN9H7kpwj8VhtxHkAJPmogMvxNXcNauf4="
else "sha256-Ay28HmBvAsH+jOYO1V5mL7OUfkRwP3BQ/Rm9A1gNh4I=";
aarch64-linux = "sha256-FKz6SRmS5E/BJ1WqIjRiVKGfgedmRG6ip/eAmn6LdcQ=";
x86_64-darwin = "sha256-GnDlloMOPSEX66hLPrVCKJmKBJ8dUTp7nG/XF0fVESc=";
aarch64-darwin = "sha256-36pg8Vywm7+h5vWcoEeW4Ab9gZ39Mtx6aVFIV4L2cjA=";
}.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
};

View file

@ -81,7 +81,7 @@ buildBazelPackage rec {
rm -rf $bazelOut/external/com_google_protobuf
'';
sha256 = "sha256-R+Hc9ldYcKgAXETKr2+Hk7IrjJ93WkrjyJ1SQRoM9V4=";
sha256 = "sha256-AiSUwoa0JKChSSPSi1EWTpUKQggmOsjLB6fRMCAgUyE=";
};
buildAttrs = {

View file

@ -26,12 +26,12 @@
}:
let
version = "5.2.0";
version = "5.3.2";
sourceRoot = ".";
src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
sha256 = "sha256-ggqU27FAce1tjCZs8MCA7LJlpe6mUwdXlInEZiwtWCo=";
hash = "sha256-OICtkZWS0ePkDFBvE7Ms0KLibxKdh8troXDxgB19e4I=";
};
# Update with `eval $(nix-build -A bazel_5.updater)`,

View file

@ -83,8 +83,8 @@ buildBazelPackage rec {
fetchAttrs = {
sha256 = {
x86_64-linux = "sha256-zEebnLFGLUy6UR5Uf2f6s23s6tXYccp5SHzTcldDKwQ=";
aarch64-linux = "sha256-UfowJD9uUBimRbIaSq2US6BpEVDDqSLchSDJ1k0Cfwk=";
x86_64-linux = "sha256-MRkh00f7FyCdelOObkS0lBnOoyh2Nku9CP+kk9K8A/8=";
aarch64-linux = "sha256-t4TTVUt/L+JmLeVdN1v0eFzi8s0kF1mMoQEktPpp9iQ=";
}.${stdenv.system} or (throw "unsupported system ${stdenv.system}");
dontUseCmakeConfigure = true;
dontUseGnConfigure = true;

View file

@ -16843,7 +16843,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
buildBazelPackage = callPackage ../build-support/build-bazel-package { };
buildBazelPackage = darwin.apple_sdk_11_0.callPackage ../build-support/build-bazel-package { };
bear = callPackage ../development/tools/build-managers/bear { };