Skip to content

Commit 66ec4bf

Browse files
committed
Update LLVM/clang to 16 for MacOS and 18 for llvmPackages
nixpkgs 24.11 updated the default llvm/clang from 15->16 for MacOS and 17->18 for other platforms. We did not adopt that update resulting in multiple llvm versions being installed on those systems which is unnecessary. This commit aligns our versions with the default versions in nixpkgs. With the upcoming 25.05 both MacOS and other platforms will move to llvm/clang 19 - then we can simply drop the version numbers. Signed-off-by: Matthias J. Kannwischer <matthias@kannwischer.eu>
1 parent 669ac38 commit 66ec4bf

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

nix/util.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ rec {
1717

1818
native-gcc =
1919
if pkgs.stdenv.isDarwin
20-
then pkgs.clang_15
20+
then pkgs.clang_16
2121
else wrap-gcc pkgs;
2222

2323
# cross is for determining whether to install the cross toolchain dependencies or not
@@ -74,10 +74,10 @@ rec {
7474
name = "pqcp-linters";
7575
paths = builtins.attrValues {
7676
clang-tools = pkgs.clang-tools.overrideAttrs {
77-
unwrapped = pkgs.llvmPackages_17.clang-unwrapped;
77+
unwrapped = pkgs.llvmPackages_18.clang-unwrapped;
7878
};
7979

80-
inherit (pkgs.llvmPackages_17)
80+
inherit (pkgs.llvmPackages_18)
8181
bintools;
8282

8383
inherit (pkgs)

0 commit comments

Comments
 (0)