From 7cd27fa8d99de73b4e472e5cbfa685d637b9eff1 Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Tue, 23 Jun 2026 01:25:39 +0800 Subject: gnu: llvm: Switch default llvm to 22. * gnu/packages/llvm.scm (libomp, llvm, clang-runtime, clang, clang-toolchain): Switch to llvm-22 version. (ocaml-llvm): Use llvm-13. (wllvm)[native-inputs]: Remove clang; add clang-13. (emacs-clang-format)[arguments]: Use #:lisp-directory, Adjust configure phase. Add #:test-command. * gnu/packages/bioinformatics.scm (alignoth)[native-inputs]: Remove clang; add clang-13. (lammps)[inputs]: Remove libomp; add libomp-13. * gnu/packages/bootloaders.scm (make-grub)[inputs]: Remove clang; add clang-13. * gnu/packages/c.scm (libdispatch)[native-inputs]: Remove clang and llvm; add clang-13 and llvm-13. * gnu/packages/check.scm (pedansee)[native-inputs]: Remove clang; add clang-13. (python-lit)[native-inputs]: Remove llvm; add llvm-13. * gnu/packages/codex.scm (codex, codex-acp)[native-inputs]: Remove clang; add clang-13. * gnu/packages/compression.scm (cmix)[native-inputs]: Remove clang; add clang-13. * gnu/packages/cpp.scm (ccls)[native-inputs]: Remove clang and llvm; add clang-13 and llvm-13. * gnu/packages/darwin.scm (cctools)[inputs]: Remove clang-toolchain; add clang-toolchain-13. [native-inputs]: Remove clang-toolchain; add clang-toolchain-13. * gnu/packages/debug.scm (c-vise)[inputs]: Remove clang and llvm; add clang-13 and llvm-13. (fandango)[native-inputs]: Remove clang; add clang-13. * gnu/packages/diffoscope.scm (diffoscope)[native-inputs]: Remove llvm; add llvm-13. * gnu/packages/electronics.scm (nvc)[inputs]: Remove llvm; add llvm-13. (openroad)[inputs]: Remove libomp; add libomp-13. * gnu/packages/emacs-xyz.scm (emacs-irony-mode-server)[inputs]: Remove clang; add clang-13. * gnu/packages/file-systems.scm (bcachefs-tools-minimal)[native-inputs]: Remove clang; add clang-13. * gnu/packages/freedesktop.scm (waypipe)[native-inputs]: Remove clang; add clang-13. * gnu/packages/fusion.scm (fusion)[native-inputs]: Remove clang; add clang-13. * gnu/packages/games.scm (hedgewars)[native-inputs]: Remove clang; add clang-13. * gnu/packages/gnome.scm (gnome-builder)[inputs]: Remove clang and llvm; add clang-13 and llvm-13. * gnu/packages/gnustep.scm (libobjc2)[inputs]: Remove clang; add clang-13. * gnu/packages/gnuzilla.scm (mozjs)[native-inputs]: Remove llvm; add llvm-13. * gnu/packages/graphics.scm (openshadinglanguage)[native-inputs]: Remove clang and llvm; add clang-13 and llvm-13. (skia)[native-inputs]: Remove clang-toolchain; add clang-toolchain-13. (tinygltf)[native-inputs]: Remove clang; add clang-13. * gnu/packages/kde-sdk.scm (kdevelop)[inputs]: Remove clang; add clang-13. * gnu/packages/language.scm (liblouis)[native-inputs]: Remove clang; add clang-13. * gnu/packages/lean.scm (lean4)[inputs]: Remove llvm; add llvm-13. * gnu/packages/lisp.scm (carp, picolisp)[inputs]: Remove clang; add clang-13. * gnu/packages/machine-learning.scm (ctranslate2)[native-inputs]: Remove libomp; add libomp-13. * gnu/packages/mail.scm (stalwart)[native-inputs]: Remove clang; add clang-13. * gnu/packages/maths.scm (python-mathics-core)[inputs]: Remove llvm; add llvm-13. * gnu/packages/ocaml.scm (bap)[inputs]: Remove llvm; add llvm-13. [native-inputs]: Remove clang; add clang-13. [arguments]: Use this-package-input to get llvm version. * gnu/packages/photo.scm (darktable)[inputs]: Remove libomp; add libomp-13. [native-inputs]: Remove llvm; add llvm-13. (ansel)[native-inputs]: Remove llvm; add llvm-13. (photoflare)[inputs]: Remove libomp; add libomp-13. * gnu/packages/physics.scm (cytnx)[inputs]: Remove libomp; add libomp-13. * gnu/packages/qt.scm (clazy)[inputs]: Remove clang and llvm; add clang-13 and llvm-13. * gnu/packages/rust-apps.scm (c2rust, helvum, ouch, pwmenu) (soundcloud-tui)[native-inputs]: Remove clang; add clang-13. * gnu/packages/rust-sources.scm (rust-ring-0.17)[native-inputs]: Remove clang; add clang-13. * gnu/packages/sequoia.scm (sequoia-chameleon-gnupg) (sequoia-sq, sequoia-sqv, sequoia-wot-tools)[native-inputs]: Remove clang; add clang-13. * gnu/packages/text-editors.scm (parinfer-rust, parinfer-rust-emacs)[inputs]: Remove clang; add clang-13. * gnu/packages/virtualization.scm (xen-guest-agent)[native-inputs]: Remove clang; add clang-13. * gnu/packages/wm.scm (niri)[inputs]: Remove clang; add clang-13. * gnu/packages/xorg.scm (xf86-video-vmware)[inputs]: Remove llvm; add llvm-13. (xwayland-satellite)[inputs]: Remove clang; add clang-13. Change-Id: Ifb8f13908a9e7112466b2e966200670ddcc2f162 --- gnu/packages/graphics.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/graphics.scm') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index e22de793f09..1d81a663a05 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1036,9 +1036,9 @@ baking tools to produce normal maps.") "|"))) (native-inputs (list bison - clang + clang-13 flex - llvm + llvm-13 pybind11-2 python-wrapper)) (inputs @@ -2832,7 +2832,7 @@ Cflags: -I${includedir}~%" #$output #$version))))) (format #t "test suite not run~%"))))))) (native-inputs (append (if (target-x86-32?) - (list clang-toolchain) + (list clang-toolchain-13) '()) (list gn libjpeg-turbo ninja pkg-config python-wrapper spirv-tools spirv-headers @@ -3096,7 +3096,7 @@ and build scripts for the OpenXR loader.") (invoke "./tester_noexcept")) (format #t "test suite not run~%"))))))) (inputs (list nlohmann-json stb-image stb-image-write)) - (native-inputs (list catch-framework clang)) + (native-inputs (list catch-framework clang-13)) (home-page "https://github.com/syoyo/tinygltf") (synopsis "Header only GL Transmission Format library") (description "This package provides a header only C++11 -- cgit v1.2.3