Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
837c437
bloaty: unpin LLVM
emilazy Aug 9, 2025
3879ede
build2: unpin LLVM
emilazy Aug 9, 2025
0306ae7
mathematica: unpin LLVM
emilazy Aug 9, 2025
8153126
chez: unpin LLVM
emilazy Aug 9, 2025
d1230bc
contour: unpin LLVM
emilazy Aug 9, 2025
df39a84
inko: fix tests on Darwin
emilazy Aug 9, 2025
5fdbb69
inko: unpin LLVM
emilazy Aug 9, 2025
99701f3
ivm: unpin LLVM
emilazy Aug 10, 2025
82c7972
libunicode: unpin LLVM
emilazy Aug 10, 2025
9b5a04e
termbench-pro: unpin LLVM
emilazy Aug 10, 2025
0f147d2
ocaml-ng.ocamlPackages_4_14.bap: unpin LLVM
emilazy Aug 10, 2025
cd168a8
python313Packages.wasmer-compiler-llvm: unpin LLVM
emilazy Aug 10, 2025
8fb6d06
haskellPackages.llvm-codegen: unpin LLVM
emilazy Aug 9, 2025
0b084fb
postgresql16Packages.pgvecto-rs: unpin LLVM
emilazy Aug 10, 2025
e82363b
tetragon: unpin LLVM
emilazy Aug 10, 2025
0eebff6
tracee: unpin LLVM
emilazy Aug 12, 2025
6774d06
libsForQt5.qtwebengine: backport upstream patch for gperf ≥ 3.2
emilazy Aug 18, 2025
fb89ed3
libsForQt5.qtwebengine: bump LLVM to 19
emilazy Aug 11, 2025
257866d
flutterPackages-source.stable.engine: unpin LLVM
emilazy Aug 11, 2025
5af7cbe
ghdl-llvm: unpin LLVM
emilazy Aug 11, 2025
86e39d1
python313Packages.shiboken2: unpin LLVM
emilazy Aug 11, 2025
529489f
androidenv.androidPkgs.emulator: drop unused LLVM library
emilazy Aug 11, 2025
01e8f57
nixos/malloc: unpin LLVM for Scudo
emilazy Aug 9, 2025
21e1bb1
wasmedge: bump LLVM to 19
emilazy Aug 9, 2025
95926c7
c2ffi: llvm-16.0.0-0-unstable-2023-11-18 -> llvm-18.1.0-0-unstable-20…
emilazy Aug 9, 2025
dd781e6
terra: 1.1.0 -> 1.2.0
emilazy Aug 9, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nixos/modules/config/malloc.nix
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ let
or (throw "scudo not supported on ${pkgs.stdenv.hostPlatform.system}");
in
{
libPath = "${pkgs.llvmPackages_14.compiler-rt}/lib/linux/libclang_rt.scudo-${systemPlatform}.so";
libPath = "${pkgs.llvmPackages.compiler-rt}/lib/linux/libclang_rt.scudo-${systemPlatform}.so";
description = ''
A user-mode allocator based on LLVM Sanitizer’s CombinedAllocator,
which aims at providing additional mitigations against heap based
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/science/math/mathematica/generic.nix
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
libuuid,
libxkbcommon,
libxml2,
llvmPackages_13,
llvmPackages,
matio,
mpfr,
ncurses,
Expand Down Expand Up @@ -102,7 +102,7 @@ stdenv.mkDerivation {
libuuid
libxkbcommon
libxml2
llvmPackages_13.libllvm.lib
llvmPackages.libllvm.lib
matio
mpfr
ncurses
Expand Down
8 changes: 4 additions & 4 deletions pkgs/by-name/bl/bloaty/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
gtest,
pkg-config,
lit,
llvmPackages_16,
llvmPackages,
}:
let
# Old vendored package which has no other use than here, so not packaged in nixpkgs.
Expand All @@ -35,8 +35,8 @@ stdenv.mkDerivation {

cmakeFlags = [
"-DLIT_EXECUTABLE=${lit}/bin/lit"
"-DFILECHECK_EXECUTABLE=${llvmPackages_16.libllvm}/bin/FileCheck"
"-DYAML2OBJ_EXECUTABLE=${llvmPackages_16.libllvm}/bin/yaml2obj"
"-DFILECHECK_EXECUTABLE=${llvmPackages.libllvm}/bin/FileCheck"
"-DYAML2OBJ_EXECUTABLE=${llvmPackages.libllvm}/bin/yaml2obj"
];

postPatch = ''
Expand Down Expand Up @@ -66,7 +66,7 @@ stdenv.mkDerivation {
capstone
gtest
lit
llvmPackages_16.libllvm
llvmPackages.libllvm
];

doCheck = true;
Expand Down
12 changes: 6 additions & 6 deletions pkgs/by-name/c2/c2ffi/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
lib,
fetchFromGitHub,
cmake,
llvmPackages_16,
llvmPackages_18,
unstableGitUpdater,
}:

let
c2ffiBranch = "llvm-16.0.0";
llvmPackages = llvmPackages_16;
c2ffiBranch = "llvm-18.1.0";
llvmPackages = llvmPackages_18;
in

llvmPackages.stdenv.mkDerivation {
pname = "c2ffi-${c2ffiBranch}";
version = "0-unstable-2023-11-18";
version = "0-unstable-2024-04-20";

src = fetchFromGitHub {
owner = "rpav";
repo = "c2ffi";
rev = "097cbe61ca02dc79ea60859aa056975131a9d985";
hash = "sha256-pflolW5OoEkVDozy4cjCdUIVxgE/SfVKIhQyNBDhENc=";
rev = "0de81efb64acc82c08c5eee4a7108ddcb1b00d86";
hash = "sha256-q81Vxq/6h/5jgQ1Leq15klN/8L+UiavlxkARGo2SrJ0=";
};

passthru.updateScript = unstableGitUpdater {
Expand Down
8 changes: 0 additions & 8 deletions pkgs/by-name/ch/chez/package.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
lib,
stdenv,
llvmPackages_17,
fetchurl,
coreutils,
cctools,
Expand All @@ -13,13 +12,6 @@
testers,
}@args:

let
# x64 darwin fails with invalid memory reference with clang-18 & 19.
# https://github.com/cisco/ChezScheme/issues/896
# aarch64 darwin fails to execute `system` calls with clang-18 & 19.
# https://github.com/cisco/ChezScheme/issues/928
stdenv = if args.stdenv.hostPlatform.isDarwin then llvmPackages_17.stdenv else args.stdenv;
in
stdenv.mkDerivation (finalAttrs: {
pname = "chez-scheme";
version = "10.2.0";
Expand Down
7 changes: 3 additions & 4 deletions pkgs/by-name/co/contour/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
yaml-cpp,
ncurses,
file,
libutil,
sigtool,
darwin,
nixosTests,
installShellFiles,
reflection-cpp,
Expand Down Expand Up @@ -53,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
qt6.wrapQtAppsHook
installShellFiles
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ];
++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ];

buildInputs = [
boxed-cpp
Expand All @@ -74,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optionals stdenv.hostPlatform.isLinux [ libutempter ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
libutil
darwin.libutil
];

cmakeFlags = [ "-DCONTOUR_QT_VERSION=6" ];
Expand Down
6 changes: 4 additions & 2 deletions pkgs/by-name/in/inko/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
lib,
rustPlatform,
fetchFromGitHub,
llvm_17,
llvm,
libffi,
libz,
libxml2,
Expand Down Expand Up @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
];

nativeBuildInputs = [
llvm_17
llvm
makeWrapper
];

Expand All @@ -62,6 +62,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
};
};

__darwinAllowLocalNetworking = true;

meta = {
description = "Language for building concurrent software with confidence";
homepage = "https://inko-lang.org/";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/iv/ivm/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
fetchFromGitHub,
makeWrapper,
cargo,
llvm_16,
llvm,
stdenv,
libffi,
libz,
Expand Down Expand Up @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttr: {
--prefix PATH : ${
lib.makeBinPath [
cargo
llvm_16.dev
llvm.dev
stdenv.cc
]
} \
Expand Down
18 changes: 8 additions & 10 deletions pkgs/by-name/te/terra/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
llvmPackages_16,
llvmPackages_18,
ncurses,
cmake,
libxml2,
Expand All @@ -14,17 +14,17 @@
}:

let
luajitRev = "50936d784474747b4569d988767f1b5bab8bb6d0";
luajitRev = "83954100dba9fc0cf5eeaf122f007df35ec9a604";
luajitBase = "LuaJIT-${luajitRev}";
luajitArchive = "${luajitBase}.tar.gz";
luajitSrc = fetchFromGitHub {
owner = "LuaJIT";
repo = "LuaJIT";
rev = luajitRev;
sha256 = "1g87pl014b5v6z2nnhiwn3wf405skawszfr5wdzyfbx00j3kgxd0";
hash = "sha256-L9T6lc32dDLAp9hPI5mKOzT0c4juW9JHA3FJCpm7HNQ=";
};

llvmPackages = llvmPackages_16;
llvmPackages = llvmPackages_18;
llvmMerged = symlinkJoin {
name = "llvmClangMerged";
paths = with llvmPackages; [
Expand All @@ -37,20 +37,20 @@ let
];
};

cuda = cudaPackages.cudatoolkit_11;
cuda = cudaPackages.cudatoolkit;

clangVersion = llvmPackages.clang-unwrapped.version;

in
stdenv.mkDerivation rec {
pname = "terra";
version = "1.1.0";
version = "1.2.0";

src = fetchFromGitHub {
owner = "terralang";
repo = "terra";
rev = "release-${version}";
sha256 = "0v9vpxcp9ybwnfljskqn41vjq7c0srdfv7qs890a6480pnk4kavd";
hash = "sha256-CukNCvTHZUhjdHyvDUSH0YCVNkThUFPaeyLepyEKodA=";
};

nativeBuildInputs = [ cmake ];
Expand All @@ -65,9 +65,7 @@ stdenv.mkDerivation rec {

cmakeFlags =
let
resourceDir =
"${llvmMerged}/lib/clang/"
+ (if lib.versionOlder clangVersion "16" then clangVersion else lib.versions.major clangVersion);
resourceDir = "${llvmMerged}/lib/clang/${lib.versions.major clangVersion}";
in
[
"-DHAS_TERRA_VERSION=0"
Expand Down
8 changes: 4 additions & 4 deletions pkgs/by-name/te/tetragon/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
fetchFromGitHub,
pkg-config,
go,
llvm_16,
clang_16,
llvm,
clang,
bash,
writableTmpDirAsHomeHook,
gitMinimal,
Expand All @@ -28,9 +28,9 @@ stdenv.mkDerivation (finalAttrs: {
];

buildInputs = [
clang_16
clang
go
llvm_16
llvm
pkg-config
];

Expand Down
9 changes: 6 additions & 3 deletions pkgs/by-name/tr/tracee/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
buildGoModule,
fetchFromGitHub,

clang_14,
clang,
pkg-config,

elfutils,
Expand Down Expand Up @@ -37,10 +37,13 @@ buildGoModule rec {

enableParallelBuilding = true;
# needed to build bpf libs
hardeningDisable = [ "stackprotector" ];
hardeningDisable = [
"stackprotector"
"zerocallusedregs"
];

nativeBuildInputs = [
clang_14
clang
pkg-config
];
buildInputs = [
Expand Down
3 changes: 1 addition & 2 deletions pkgs/development/compilers/flutter/engine/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
fetchgit,
runCommand,
llvmPackages,
llvmPackages_15,
patchelf,
openbox,
xorg,
Expand Down Expand Up @@ -217,7 +216,7 @@ stdenv.mkDerivation (finalAttrs: {
cp -pr --reflink=auto $swiftshader src/flutter/third_party/swiftshader
chmod -R u+w -- src/flutter/third_party/swiftshader

ln -s ${llvmPackages_15.llvm.monorepoSrc} src/flutter/third_party/swiftshader/third_party/llvm-project
ln -s ${llvmPackages.llvm.monorepoSrc} src/flutter/third_party/swiftshader/third_party/llvm-project

mkdir -p src/flutter/buildtools/${constants.alt-platform}
ln -s ${llvm} src/flutter/buildtools/${constants.alt-platform}/clang
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/haskell-modules/configuration-nix.nix
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ builtins.intersectAttrs super {

# Doesn't declare LLVM dependency, needs llvm-config
llvm-codegen = addBuildTools [
pkgs.llvmPackages_17.llvm.dev # for native llvm-config
pkgs.llvmPackages.llvm.dev # for native llvm-config
] super.llvm-codegen;

# hledger* overrides
Expand Down
16 changes: 4 additions & 12 deletions pkgs/development/libraries/qt-5/5.15/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@
gst-plugins-base,
gtk3,
dconf,
llvmPackages_15,
overrideLibcxx,
llvmPackages_19,
darwin,

# options
Expand Down Expand Up @@ -328,16 +327,9 @@ let
qtwayland = callPackage ../modules/qtwayland.nix { };
qtwebchannel = callPackage ../modules/qtwebchannel.nix { };
qtwebengine = callPackage ../modules/qtwebengine.nix {
# The version of Chromium used by Qt WebEngine 5.15.x does not build with clang 16 due
# to the following errors:
# * -Wenum-constexpr-conversion: This is a downgradable error in clang 16, but it is planned
# to be made into a hard error in a future version of clang. Patches are not available for
# the version of v8 used by Chromium in Qt WebEngine, and fixing the code is non-trivial.
# * -Wincompatible-function-pointer-types: This is also a downgradable error generated
# starting with clang 16. Patches are available upstream that can be backported.
# Because the first error is non-trivial to fix and suppressing it risks future breakage,
# clang is pinned to clang 15. That also makes fixing the second set of errors unnecessary.
stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_15.stdenv else stdenv;
# Won’t build with Clang 20, as `-Wenum-constexpr-conversion`
# was made a hard error.
stdenv = if stdenv.cc.isClang then llvmPackages_19.stdenv else stdenv;
inherit (srcs.qtwebengine) version;
inherit (darwin) bootstrap_cmds;
python = python3;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Backported from: <https://github.com/chromium/chromium/commit/f8f21fb4aa01f75acbb12abf5ea8c263c6817141.patch>
Original author: Daniel Richard G <iskunk@gmail.com>

diff --git a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py
index 5ee4905..6c500a0 100644
--- a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py
+++ b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py
@@ -36,10 +36,13 @@ def generate_gperf(gperf_path, gperf_input, gperf_args):
# https://savannah.gnu.org/bugs/index.php?53028
gperf_output = re.sub(r'\bregister ', '', gperf_output)
# -Wimplicit-fallthrough needs an explicit fallthrough statement,
- # so replace gperf's /*FALLTHROUGH*/ comment with the statement.
- # https://savannah.gnu.org/bugs/index.php?53029
- gperf_output = gperf_output.replace('/*FALLTHROUGH*/',
- ' FALLTHROUGH;')
+ # so replace gperf 3.1's /*FALLTHROUGH*/ comment with the statement.
+ # https://savannah.gnu.org/bugs/index.php?53029 (fixed in 3.2)
+ if re.search(
+ r'/\* C\+\+ code produced by gperf version 3\.[01](\.\d+)? \*/',
+ gperf_output):
+ gperf_output = gperf_output.replace('/*FALLTHROUGH*/',
+ ' [[fallthrough]];')
# -Wpointer-to-int-cast warns about casting pointers to smaller ints
# Replace {(int)(long)&(foo), bar} with
# {static_cast<int>(reinterpret_cast<uintptr_t>(&(foo)), bar}
3 changes: 3 additions & 0 deletions pkgs/development/libraries/qt-5/modules/qtwebengine.nix
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,9 @@ qtModule (
hash = "sha256-DcAYOV9b30ogPCiedvQimEmiZpUJquk5j6WLjJxR54U=";
extraPrefix = "";
})

# Fix the build with gperf ≥ 3.2 and Clang 19.
./qtwebengine-gperf-3.2.patch
];

postPatch = ''
Expand Down
Loading
Loading