chore(3p/overlays): Remove LLVM11 bump from overlay
* 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>
This commit is contained in:
parent
c420f122f3
commit
3c7d4c74be
14 changed files with 26 additions and 30 deletions
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ with lib;
|
|||
gdb
|
||||
lldb
|
||||
hyperfine
|
||||
clang-tools
|
||||
clang-tools_11
|
||||
(rr.overrideAttrs (_: rec {
|
||||
version = "f25671d094edac8059cec56b98d7f10f2c740697";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -220,7 +220,7 @@ in lib.fix(self: {
|
|||
bat
|
||||
chromium
|
||||
clang-manpages
|
||||
clang-tools
|
||||
clang-tools_11
|
||||
clang_11
|
||||
curl
|
||||
direnv
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue