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 | |
| 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>
| -rw-r--r-- | third_party/cpp/googleapis/default.nix | 2 | ||||
| -rw-r--r-- | third_party/default.nix | 15 | ||||
| -rw-r--r-- | users/tazjin/dt/default.nix | 2 | ||||
| -rw-r--r-- | users/tazjin/nixos/frog/default.nix | 2 |
4 files changed, 12 insertions, 9 deletions
diff --git a/third_party/cpp/googleapis/default.nix b/third_party/cpp/googleapis/default.nix index 5fc40ac9f7ad..32f7d6f9bc1d 100644 --- a/third_party/cpp/googleapis/default.nix +++ b/third_party/cpp/googleapis/default.nix @@ -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 = ./.; diff --git a/third_party/default.nix b/third_party/default.nix index 69bd75642c83..10e78bcc2031 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 # diff --git a/users/tazjin/dt/default.nix b/users/tazjin/dt/default.nix index ae9388d187be..04430c883bf6 100644 --- a/users/tazjin/dt/default.nix +++ b/users/tazjin/dt/default.nix @@ -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"; diff --git a/users/tazjin/nixos/frog/default.nix b/users/tazjin/nixos/frog/default.nix index e9381bb076d3..a3e263d095a1 100644 --- a/users/tazjin/nixos/frog/default.nix +++ b/users/tazjin/nixos/frog/default.nix @@ -239,7 +239,7 @@ in depot.lib.fix(self: { chromium clang-manpages clang-tools - clang_10 + clang_11 curl direnv dnsutils |