From 13c152bb1cbc0a2594826e20440c5b5e69bc1620 Mon Sep 17 00:00:00 2001 From: Timothy Date: Tue, 21 Dec 2021 10:19:05 +0700 Subject: [PATCH] bazel_4: 4.2.1 -> 4.2.2 --- .../tools/build-managers/bazel/bazel_4/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 3dd40ad1f8a4..d0e2aa513603 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -27,12 +27,12 @@ }: let - version = "4.2.1"; + version = "4.2.2"; sourceRoot = "."; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "Eup6oR4r2xLeHc65k5oi6W9aSAQ3yxfBIzedjg/fXoI="; + sha256 = "mYHQ1To1bE6HlihHdQqXyegFTkYIVHSABsgPDX4rLTM="; }; # Update with `eval $(nix-build -A bazel.updater)`, @@ -214,14 +214,6 @@ stdenv.mkDerivation rec { src = ../bazel_rc.patch; bazelSystemBazelRCPath = bazelRC; }) - - # On macOS Monterey, protoc segfaults. - # Issue: https://github.com/bazelbuild/bazel/issues/14216 - # Fix: https://github.com/bazelbuild/bazel/pull/14275 - (fetchpatch { - url = "https://github.com/bazelbuild/bazel/commit/ae0a6c98d4f94abedbedb2d51c27de5febd7df67.patch"; - sha256 = "sha256-YcdxqjTMGI86k1wgFqxJqghv0kknAjlFQFpt4VccCTE="; - }) ] ++ lib.optional enableNixHacks ../nix-hacks.patch;