movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 04:35:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

llvmPackages_20: 20.1.0-rc3 -> 20.1.1

Browse source
This commit is contained in:
Tristan Ross 2025-03-04 18:37:51 -08:00 • committed by Alyssa Ross
parent 8d1014694d
commit f18673aa02
5 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pkgs/development/compilers/llvm/common/libc/default.nix
View file

@ -77,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
}; };
meta = llvm_meta // { meta = llvm_meta // {
broken = stdenv.hostPlatform.isDarwin;
homepage = "https://libc.llvm.org/"; homepage = "https://libc.llvm.org/";
description = "Standard C library for LLVM"; description = "Standard C library for LLVM";
}; };

11
pkgs/development/compilers/llvm/common/llvm/default.nix
View file

@ -513,12 +513,19 @@ stdenv.mkDerivation (finalAttrs: {
] ++ [ ] ++ [
"-DLLVM_TABLEGEN=${buildLlvmTools.tblgen}/bin/llvm-tblgen" "-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 ++ [ in flagsForLlvmConfig ++ [
"-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc
"-DLLVM_BUILD_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" "-DLLVM_BUILD_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}"
"-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_FFI=ON"
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_HOST_TRIPLE=${triple}"
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${triple}"
"-DLLVM_ENABLE_DUMP=ON" "-DLLVM_ENABLE_DUMP=ON"
(lib.cmakeBool "LLVM_ENABLE_TERMINFO" enableTerminfo) (lib.cmakeBool "LLVM_ENABLE_TERMINFO" enableTerminfo)
] ++ optionals (!finalAttrs.finalPackage.doCheck) [ ] ++ optionals (!finalAttrs.finalPackage.doCheck) [

2
pkgs/development/compilers/llvm/common/mlir/default.nix
View file

@ -71,6 +71,8 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
meta = llvm_meta // { 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/"; homepage = "https://mlir.llvm.org/";
description = "Multi-Level IR Compiler Framework"; description = "Multi-Level IR Compiler Framework";
longDescription = '' longDescription = ''

2
pkgs/development/compilers/llvm/default.nix
View file

@ -31,7 +31,7 @@ let
"17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag="; "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag=";
"18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";
"19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I="; "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 = { "21.0.0-git".gitRelease = {
rev = "4fde8c341f9166e6ec6dff6e7704be175e382f5b"; rev = "4fde8c341f9166e6ec6dff6e7704be175e382f5b";
rev-version = "21.0.0-unstable-2025-03-16"; rev-version = "21.0.0-unstable-2025-03-16";

2
pkgs/top-level/aliases.nix
View file

@ -1735,7 +1735,7 @@ mapAliases {
openbsdCross = openbsd; # Added 2024-09-06 openbsdCross = openbsd; # Added 2024-09-06
# LLVM packages for (integration) testing that should not be used inside Nixpkgs: # 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 /* If these are in the scope of all-packages.nix, they cause collisions
between mixed versions of qt. See: between mixed versions of qt. See: