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/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'third_party/nix/default.nix') diff --git a/third_party/nix/default.nix b/third_party/nix/default.nix index df6a6da72f..42b0324e8e 100644 --- a/third_party/nix/default.nix +++ b/third_party/nix/default.nix @@ -57,14 +57,14 @@ let cp ${pkgs.busybox}/bin/busybox $out/bin ''; -in lib.fix (self: pkgs.llvmPackages.libcxxStdenv.mkDerivation { +in lib.fix (self: pkgs.llvmPackages_11.libcxxStdenv.mkDerivation { pname = "tvix"; version = "2.3.4"; inherit src; nativeBuildInputs = with pkgs; [ bison - clang-tools + clang-tools_11 cmake libxml2 libxslt @@ -143,7 +143,7 @@ in lib.fix (self: pkgs.llvmPackages.libcxxStdenv.mkDerivation { NIX_PROTO_SRCS = protoSrcs; # Work around broken system header include flags in the cxx toolchain. - LIBCXX_INCLUDE = "${pkgs.llvmPackages.libcxx}/include/c++/v1"; + LIBCXX_INCLUDE = "${pkgs.llvmPackages_11.libcxx}/include/c++/v1"; SANDBOX_SHELL="${pkgs.busybox}/bin/busybox"; -- cgit 1.4.1