diff options
| author | Emily <vcs@emily.moe> | 2024-10-31 20:11:16 +0000 |
|---|---|---|
| committer | Emily <vcs@emily.moe> | 2024-11-07 23:05:27 +0000 |
| commit | 279a589dcfe5d86b2364aea8ba8fdf24d9ebd2d4 (patch) | |
| tree | 06091aa64fb6f23717c89af4dcadf355e4d589e1 | |
| parent | wasilibc: 21 -> 22-unstable-2024-10-16 (diff) | |
| download | nixpkgs-279a589dcfe5d86b2364aea8ba8fdf24d9ebd2d4.tar.gz | |
llvmPackages: llvmPackages_{16,18} -> llvmPackages_19
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0164245a6fa3..2ca56f8fa694 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15049,18 +15049,7 @@ with pkgs; libllvm = llvmPackages.libllvm; llvm-manpages = llvmPackages.llvm-manpages; - # Please remove all this logic when bumping to LLVM 19 and make this - # a simple alias. - llvmPackages = let - # This returns the minimum supported version for the platform. The - # assumption is that or any later version is good. - choose = platform: if platform.isDarwin then 16 else 18; - # We take the "max of the mins". Why? Since those are lower bounds of the - # supported version set, this is like intersecting those sets and then - # taking the min bound of that. - minSupported = toString (lib.trivial.max (choose stdenv.hostPlatform) (choose - stdenv.targetPlatform)); - in pkgs.${"llvmPackages_${minSupported}"}; + llvmPackages = llvmPackages_19; llvmPackages_12 = recurseIntoAttrs (callPackage ../development/compilers/llvm/12 { inherit (stdenvAdapters) overrideCC; |