From 3c7d4c74be3490589867fb99fed2c93d00172ca8 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 23 May 2021 13:33:59 +0200 Subject: chore(3p/overlays): Remove LLVM11 bump from overlay * This was mostly for //third_party/nix and its dependencies which now have been set to use llvmPackages_11 manually. * For //users/grfn/achilles we also manually select the newer LLVM version. * //tools/cheddar doesn't seem to need llvm anymore. * //third_party/buzz also compiles with clang 7.1.0 * replace clang-tools everywhere with new attribute clang-tools_11 For the future we may want to have something similar again, but it may not be necessary to invest too much time into it: nixpkgs is set to upgrade their default llvmPackages to LLVM 11 as well at some point in the near future. Co-Authored-By: sterni Change-Id: Id83868dbc476a6c776b59518b856c933f30ea79d Reviewed-on: https://cl.tvl.fyi/c/depot/+/3135 Tested-by: BuildkiteCI Reviewed-by: tazjin Reviewed-by: sterni Reviewed-by: grfn --- third_party/grpc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'third_party/grpc') diff --git a/third_party/grpc/default.nix b/third_party/grpc/default.nix index f8fd1ac896..8441136929 100644 --- a/third_party/grpc/default.nix +++ b/third_party/grpc/default.nix @@ -2,7 +2,7 @@ (pkgs.grpc.override { protobuf = depot.third_party.protobuf; - stdenv = pkgs.llvmPackages.libcxxStdenv; + stdenv = pkgs.llvmPackages_11.libcxxStdenv; abseil-cpp = depot.third_party.abseil_cpp; }).overrideAttrs(orig: rec { cmakeFlags = orig.cmakeFlags ++ [ -- cgit 1.4.1