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

1 files changed, 21 insertions, 16 deletions

diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index 9ef6b383664..963e3976184 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -1275,11 +1275,11 @@ Library.")
   (make-clang-toolchain clang-22 libomp-22))
 
 ;; Default LLVM and Clang version.
-(define-public libomp libomp-13)
-(define-public llvm llvm-13)
-(define-public clang-runtime clang-runtime-13)
-(define-public clang clang-13)
-(define-public clang-toolchain clang-toolchain-13)
+(define-public libomp libomp-22)
+(define-public llvm llvm-22)
+(define-public clang-runtime clang-runtime-22)
+(define-public clang clang-22)
+(define-public clang-toolchain clang-toolchain-22)
 
 
 
@@ -2332,15 +2332,20 @@ dependency relationships is easier, particularly for large projects.")
      (list clang))
     (propagated-inputs '())
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'configure
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((clang-format (search-input-file inputs "/bin/clang-format")))
-               (copy-file "tools/clang-format/clang-format.el" "clang-format.el")
-               (emacs-substitute-variables "clang-format.el"
-                 ("clang-format-executable"
-                  clang-format))))))))
+     (list
+      #:lisp-directory "clang/tools/clang-format"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'configure
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((clang-format (search-input-file inputs "/bin/clang-format")))
+                (emacs-substitute-variables "clang-format.el"
+                  ("clang-format-executable"
+                   clang-format))))))
+      #:test-command #~(list "emacs" "-Q" "--batch"
+                             "-l" "clang-format.el"
+                             "-l" "clang-format-test.el"
+                             "-f" "ert-run-tests-batch-and-exit")))
     (synopsis "Format code using clang-format")
     (description "This package filters code through @code{clang-format}
 to fix its formatting.  @code{clang-format} is a tool that formats
@@ -2463,7 +2468,7 @@ using @code{clang-rename}.")))
       (description "This package contains the OCaml bindings distributed with
 LLVM."))))
 
-(define-public ocaml-llvm (make-ocaml-llvm llvm))
+(define-public ocaml-llvm (make-ocaml-llvm llvm-13))
 
 (define-public wllvm
   (package
@@ -2506,7 +2511,7 @@ LLVM."))))
                   (("'file'")
                    (pystr (search-input-file inputs "/bin/file"))))))))))
     (inputs (list binutils file))
-    (native-inputs (list clang procps python-pytest python-setuptools))
+    (native-inputs (list clang-13 procps python-pytest python-setuptools))
     (home-page "https://github.com/SRI-CSL/whole-program-llvm")
     (synopsis "Whole Program LLVM")
     (description "This package provides a toolkit for building whole-program