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/abseil_cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'third_party/abseil_cpp/default.nix') diff --git a/third_party/abseil_cpp/default.nix b/third_party/abseil_cpp/default.nix index e154d3c95ddb..5b99fbc56f1d 100644 --- a/third_party/abseil_cpp/default.nix +++ b/third_party/abseil_cpp/default.nix @@ -1,7 +1,7 @@ { pkgs, lib, ... }: -let inherit (pkgs) cmake llvmPackages; -in llvmPackages.libcxxStdenv.mkDerivation rec { +let inherit (pkgs) cmake llvmPackages_11; +in llvmPackages_11.libcxxStdenv.mkDerivation rec { pname = "abseil-cpp"; version = "20200519-768eb2ca+tvl-1"; src = ./.; -- cgit 1.4.1