chore(3p): upgrade llvm to version 11

Additionally, anchor clang-tools to match the current llvmPackages version.

Change-Id: I27a199cadb55907c3e2deabfd1d14a5b50fc541b
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2166
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: glittershark <grfn@gws.fyi>
This commit is contained in:
Kane York 2020-11-27 10:43:33 -08:00 committed by kanepyork
parent 77be22549a
commit 844c84a38a
4 changed files with 12 additions and 9 deletions

View file

@ -4,7 +4,7 @@
let
inherit (pkgs) fetchFromGitHub;
stdenv = with pkgs; overrideCC pkgs.stdenv clang_10;
stdenv = with pkgs; overrideCC pkgs.stdenv clang_11;
in stdenv.mkDerivation {
name = "googleapis-cpp";
src = ./.;

View file

@ -54,8 +54,7 @@ let
cairo
cargo
cgit
clang-tools
clang_10
clang_11
cmake
coreutils
cudatoolkit
@ -220,10 +219,14 @@ in exposed.lib.fix(self: exposed // {
ffmpeg = nixpkgs.ffmpeg-full;
};
# Use LLVM 10
llvmPackages = nixpkgs.llvmPackages_10;
clangStdenv = nixpkgs.llvmPackages_10.stdenv;
stdenv = nixpkgs.llvmPackages_10.stdenv;
# Use LLVM 11
llvmPackages = nixpkgs.llvmPackages_11;
clangStdenv = nixpkgs.llvmPackages_11.stdenv;
stdenv = nixpkgs.llvmPackages_11.stdenv;
clang-tools = (nixpkgs.clang-tools.override {
llvmPackages = nixpkgs.llvmPackages_11;
});
# Provide Emacs 27
#

View file

@ -1,7 +1,7 @@
{ depot, pkgs, ... }:
let
stdenv = with pkgs; overrideCC clangStdenv clang_10;
stdenv = with pkgs; overrideCC clangStdenv clang_11;
abseil_cpp = pkgs.abseil_cpp;
in stdenv.mkDerivation {
name = "dt";

View file

@ -239,7 +239,7 @@ in depot.lib.fix(self: {
chromium
clang-manpages
clang-tools
clang_10
clang_11
curl
direnv
dnsutils