chore(3p/overlays): Remove LLVM11 bump from overlay r/2622

* 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 <sternenseemann@systemli.org>
Change-Id: Id83868dbc476a6c776b59518b856c933f30ea79d
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3135
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: grfn <grfn@gws.fyi>

14 files changed, 26 insertions, 30 deletions

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 = ./.;
diff --git a/third_party/buzz/default.nix b/third_party/buzz/default.nix
index ad533feed9d6..fd8c0b7fce15 100644
--- a/third_party/buzz/default.nix
+++ b/third_party/buzz/default.nix
@@ -21,7 +21,6 @@ depot.third_party.naersk.buildPackage {
     gtk3
     dbus-glib
     libappindicator-gtk3
-    clang_11
     llvmPackages.llvm
     llvmPackages.bintools
     llvmPackages.clang
diff --git a/third_party/glog/default.nix b/third_party/glog/default.nix
index 575821cb49d6..9fe9ce484ceb 100644
--- a/third_party/glog/default.nix
+++ b/third_party/glog/default.nix
@@ -1,7 +1,7 @@
 { pkgs, lib, ... }:
 
-let inherit (pkgs) llvmPackages cmake;
-in llvmPackages.libcxxStdenv.mkDerivation {
+let inherit (pkgs) llvmPackages_11 cmake;
+in llvmPackages_11.libcxxStdenv.mkDerivation {
   name = "glog";
   version = "20200527-unstable";
   src = ./.;
diff --git a/third_party/grpc/default.nix b/third_party/grpc/default.nix
index f8fd1ac89639..84411369299b 100644
--- a/third_party/grpc/default.nix
+++ b/third_party/grpc/default.nix
@@ -2,7 +2,7 @@
 
 (pkgs.grpc.override {
   protobuf = depot.third_party.protobuf;
-  stdenv = pkgs.llvmPackages.libcxxStdenv;
+  stdenv = pkgs.llvmPackages_11.libcxxStdenv;
   abseil-cpp = depot.third_party.abseil_cpp;
 }).overrideAttrs(orig: rec {
   cmakeFlags = orig.cmakeFlags ++ [
diff --git a/third_party/gtest/default.nix b/third_party/gtest/default.nix
index f320c29d234b..5491450aa314 100644
--- a/third_party/gtest/default.nix
+++ b/third_party/gtest/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 (pkgs.gtest.override {
-  stdenv = pkgs.llvmPackages.libcxxStdenv;
+  stdenv = pkgs.llvmPackages_11.libcxxStdenv;
 }).overrideAttrs(_: {
   src = pkgs.fetchFromGitHub {
     owner = "google";
diff --git a/third_party/nix/clangd.nix b/third_party/nix/clangd.nix
index 70d2fa321476..7a29819b10ee 100644
--- a/third_party/nix/clangd.nix
+++ b/third_party/nix/clangd.nix
@@ -23,8 +23,8 @@ pkgs.writeShellScriptBin "nix-clangd" ''
 
   export CPATH=''${CPATH}''${CPATH:+':'}:$(buildcpath ''${NIX_CFLAGS_COMPILE})
   export CPATH=${pkgs.glibc.dev}/include''${CPATH:+':'}''${CPATH}
-  export CPLUS_INCLUDE_PATH=${pkgs.llvmPackages.libcxx}/include/c++/v1:''${CPATH}
+  export CPLUS_INCLUDE_PATH=${pkgs.llvmPackages_11.libcxx}/include/c++/v1:''${CPATH}
 
   # TODO(tazjin): Configurable commands directory?
-  exec -a clangd ${pkgs.llvmPackages.clang-unwrapped}/bin/clangd -cross-file-rename $@
+  exec -a clangd ${pkgs.llvmPackages_11.clang-unwrapped}/bin/clangd -cross-file-rename $@
 ''
diff --git a/third_party/nix/default.nix b/third_party/nix/default.nix
index df6a6da72ff7..42b0324e8ea9 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";
 
diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix
index 4abb8f7485d5..3482b7416b4e 100644
--- a/third_party/overlays/tvl.nix
+++ b/third_party/overlays/tvl.nix
@@ -18,12 +18,9 @@ self: super: {
     };
   };
 
-  # Use LLVM 11
-  llvmPackages = self.llvmPackages_11;
-  clangStdenv = self.llvmPackages_11.stdenv;
-  clang-tools = (super.clang-tools.override {
+  clang-tools_11 = self.clang-tools.override {
     llvmPackages = self.llvmPackages_11;
-  });
+  };
 
   # Add our Emacs packages to the fixpoint
   emacsPackagesFor = emacs: (
diff --git a/third_party/protobuf/default.nix b/third_party/protobuf/default.nix
index c9e34b2fc309..569cb269b204 100644
--- a/third_party/protobuf/default.nix
+++ b/third_party/protobuf/default.nix
@@ -4,9 +4,9 @@
 pkgs.callPackage "${pkgs.path}/pkgs/development/libraries/protobuf/generic-v3.nix" {
   version = "3.12.2";
   sha256 = "1lp368aa206vpic9fmax4k6llnmf28plfvkkm4vqhgphmjqykvl2";
-  stdenv = pkgs.llvmPackages.libcxxStdenv;
+  stdenv = pkgs.llvmPackages_11.libcxxStdenv;
   buildPackages = {
     inherit (pkgs) which;
-    stdenv = pkgs.llvmPackages.libcxxStdenv;
+    stdenv = pkgs.llvmPackages_11.libcxxStdenv;
   };
 }
diff --git a/third_party/rapidcheck/default.nix b/third_party/rapidcheck/default.nix
index a442f7f99116..79fd7fa123b3 100644
--- a/third_party/rapidcheck/default.nix
+++ b/third_party/rapidcheck/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 (pkgs.callPackage "${pkgs.path}/pkgs/development/libraries/rapidcheck" {
-  stdenv = pkgs.llvmPackages.libcxxStdenv;
+  stdenv = pkgs.llvmPackages_11.libcxxStdenv;
 }).overrideAttrs (attrs: rec {
   # follows the versioning scheme of nixpkgs, since rapidcheck does not
   # provide versioned releases
diff --git a/tools/cheddar/default.nix b/tools/cheddar/default.nix
index b7c5070b3d51..c8d7ba5ffef2 100644
--- a/tools/cheddar/default.nix
+++ b/tools/cheddar/default.nix
@@ -8,9 +8,5 @@ depot.third_party.naersk.buildPackage {
     # Use our custom bat syntax set, which is everything from upstream,
     # plus additional languages we care about.
     BAT_SYNTAXES = "${depot.third_party.bat_syntaxes}";
-
-    # LLVM packages (why are they even required?) are not found
-    # automatically if added to buildInputs, hence this ...
-    LIBCLANG_PATH = "${pkgs.llvmPackages.libclang}/lib/libclang.so.10";
   };
 }
diff --git a/users/grfn/achilles/default.nix b/users/grfn/achilles/default.nix
index 4ad71455d444..5245049d4a32 100644
--- a/users/grfn/achilles/default.nix
+++ b/users/grfn/achilles/default.nix
@@ -1,20 +1,24 @@
 { depot, pkgs, ... }:
 
+let
+  llvmPackages = pkgs.llvmPackages_11;
+in
+
 depot.third_party.naersk.buildPackage {
   src = ./.;
 
-  buildInputs = with pkgs; [
-    clang_11
+  buildInputs = [
+    llvmPackages.clang
     llvmPackages.llvm
     llvmPackages.bintools
-    llvmPackages.clang
     llvmPackages.libclang.lib
+  ] ++ (with pkgs; [
     zlib
     ncurses
     libxml2
     libffi
     pkgconfig
-  ];
+  ]);
 
   doCheck = true;
 }
diff --git a/users/grfn/system/home/modules/development.nix b/users/grfn/system/home/modules/development.nix
index 932c03d40885..43bb7a79a21d 100644
--- a/users/grfn/system/home/modules/development.nix
+++ b/users/grfn/system/home/modules/development.nix
@@ -55,7 +55,7 @@ with lib;
     gdb
     lldb
     hyperfine
-    clang-tools
+    clang-tools_11
     (rr.overrideAttrs (_: rec {
       version = "f25671d094edac8059cec56b98d7f10f2c740697";
       src = pkgs.fetchFromGitHub {
diff --git a/users/tazjin/nixos/frog/default.nix b/users/tazjin/nixos/frog/default.nix
index 3b0cac643ec7..325483aafbfe 100644
--- a/users/tazjin/nixos/frog/default.nix
+++ b/users/tazjin/nixos/frog/default.nix
@@ -220,7 +220,7 @@ in lib.fix(self: {
       bat
       chromium
       clang-manpages
-      clang-tools
+      clang-tools_11
       clang_11
       curl
       direnv