diff options
| author | Vincent Ambo <mail@tazj.in> | 2021-05-23T11·33+0200 |
|---|---|---|
| committer | tazjin <mail@tazj.in> | 2021-05-24T18·15+0000 |
| commit | 3c7d4c74be3490589867fb99fed2c93d00172ca8 (patch) | |
| tree | ec5961765712f24c1ed243ac08d5ae44c1e70f66 /third_party/nix | |
| parent | c420f122f3f822a2824f7e689b6d6df16f3c0f8d (diff) | |
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>
Diffstat (limited to 'third_party/nix')
| -rw-r--r-- | third_party/nix/clangd.nix | 4 | ||||
| -rw-r--r-- | third_party/nix/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
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"; |