From f18673aa02b3656a22741c50f4a18e39a0d19b08 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Tue, 4 Mar 2025 18:37:51 -0800 Subject: [PATCH] llvmPackages_20: 20.1.0-rc3 -> 20.1.1 --- .../compilers/llvm/common/libc/default.nix | 1 + .../compilers/llvm/common/llvm/default.nix | 11 +++++++++-- .../compilers/llvm/common/mlir/default.nix | 2 ++ pkgs/development/compilers/llvm/default.nix | 2 +- pkgs/top-level/aliases.nix | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/libc/default.nix b/pkgs/development/compilers/llvm/common/libc/default.nix index 2ba098da2814..6ccc7e44ff61 100644 --- a/pkgs/development/compilers/llvm/common/libc/default.nix +++ b/pkgs/development/compilers/llvm/common/libc/default.nix @@ -77,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = llvm_meta // { + broken = stdenv.hostPlatform.isDarwin; homepage = "https://libc.llvm.org/"; description = "Standard C library for LLVM"; }; diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index f9986621df4a..345e466412c2 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -513,12 +513,19 @@ stdenv.mkDerivation (finalAttrs: { ] ++ [ "-DLLVM_TABLEGEN=${buildLlvmTools.tblgen}/bin/llvm-tblgen" ]; + + triple = + if stdenv.hostPlatform.isDarwin && lib.versionAtLeast release_version "20" then + # JIT tests expect the triple to use Darwin arch's naming for CPU architectures. + "${stdenv.hostPlatform.darwinArch}-apple-${stdenv.hostPlatform.darwinPlatform}" + else + stdenv.hostPlatform.config; in flagsForLlvmConfig ++ [ "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" "-DLLVM_ENABLE_FFI=ON" - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_HOST_TRIPLE=${triple}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${triple}" "-DLLVM_ENABLE_DUMP=ON" (lib.cmakeBool "LLVM_ENABLE_TERMINFO" enableTerminfo) ] ++ optionals (!finalAttrs.finalPackage.doCheck) [ diff --git a/pkgs/development/compilers/llvm/common/mlir/default.nix b/pkgs/development/compilers/llvm/common/mlir/default.nix index 8f2f28c72c65..9bccb3c4c6c1 100644 --- a/pkgs/development/compilers/llvm/common/mlir/default.nix +++ b/pkgs/development/compilers/llvm/common/mlir/default.nix @@ -71,6 +71,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; meta = llvm_meta // { + # Very broken since the dependencies aren't propagating at all with tblgen through the CMake. + broken = lib.versionAtLeast release_version "20"; homepage = "https://mlir.llvm.org/"; description = "Multi-Level IR Compiler Framework"; longDescription = '' diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 27eda9772f5d..30825787132a 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -31,7 +31,7 @@ let "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag="; "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I="; - "20.1.0-rc3".officialRelease.sha256 = "sha256-mLSBoyq24FD+khynC6sC5IkDFqizgAn07lR9+ZRXlV0="; + "20.1.1".officialRelease.sha256 = "sha256-hDFYi5wAUDQ8xfjvbGFi05KdawrN9lwrrSC8AcTpCEE="; "21.0.0-git".gitRelease = { rev = "4fde8c341f9166e6ec6dff6e7704be175e382f5b"; rev-version = "21.0.0-unstable-2025-03-16"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 741dca6e8c2b..712e0e62d8b5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1735,7 +1735,7 @@ mapAliases { openbsdCross = openbsd; # Added 2024-09-06 # LLVM packages for (integration) testing that should not be used inside Nixpkgs: - llvmPackages_latest = llvmPackages_19; + llvmPackages_latest = llvmPackages_20; /* If these are in the scope of all-packages.nix, they cause collisions between mixed versions of qt. See: