diff options
| author | Kane York <kanepyork@gmail.com> | 2020-11-27T18·43-0800 |
|---|---|---|
| committer | kanepyork <rikingcoding@gmail.com> | 2020-11-29T03·02+0000 |
| commit | 844c84a38a1392a83becb0d6982f14a7d5fec536 (patch) | |
| tree | 912c59e6b15e50a057c0fc2734dd400125971c69 /third_party/default.nix | |
| parent | 77be22549a436d0869d8f8c91c09e5b3219567b7 (diff) | |
chore(3p): upgrade llvm to version 11 r/1958
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>
Diffstat (limited to 'third_party/default.nix')
| -rw-r--r-- | third_party/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/third_party/default.nix b/third_party/default.nix index 69bd75642c..10e78bcc20 100644 --- a/third_party/default.nix +++ b/third_party/default.nix @@ -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 # |