39 files changed, 88 insertions, 81 deletions

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 82273846b04..ac0e0d49398 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -207,7 +207,7 @@
     (build-system cargo-build-system)
     (arguments
      (list #:install-source? #f))
-    (native-inputs (list clang pkg-config))
+    (native-inputs (list clang-13 pkg-config))
     (inputs (cons* curl openssl zlib (cargo-inputs 'alignoth)))
     (home-page "https://github.com/alignoth/alignoth")
     (synopsis "Tool for creating alignment plots from bam files.")
@@ -6634,7 +6634,7 @@ other types of unwanted sequence from high-throughput sequencing reads.")
              n2p2
              gsl
              openblas
-             libomp
+             libomp-13
              eigen
              netcdf
              pnetcdf
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index e6e8f867e50..5e3da0dc5ee 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -242,7 +242,7 @@
              ;; little-endian binaries for the bootloader and the utilities
              ;; and building with clang is the easiest option.
              (if (target-ppc64le?)
-                 (list clang)
+                 (list clang-13)
                  '())
 
              ;; Depend on LVM2 for libdevmapper, used by 'grub-probe' and
diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm
index c46034efa63..bae975d4efb 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -1839,7 +1839,7 @@ directory contents.")
                    (setenv "NM" "llvm-nm")
                    (setenv "CC" "clang")
                    (setenv "CXX" "clang++"))))))
-    (native-inputs (list clang llvm))
+    (native-inputs (list clang-13 llvm-13))
     (home-page "https://apple.github.io/swift-corelibs-libdispatch/")
     (synopsis "Concurrent code execution on multicore hardware")
     (description
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 2065cdbf402..c3f2d532849 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -234,7 +234,7 @@ should use to get comprehensive combinatorial coverage of your parameters.")
         (base32 "0lsg791x6n95pxg6vif8qfc46nqcamhjq3g0dl5xqf6imy7n3acd"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
-     (list clang pkg-config python-wrapper))
+     (list clang-13 pkg-config python-wrapper))
     (inputs
      (list glib))
     (synopsis "Code checker for C")
@@ -2755,7 +2755,7 @@ seamlessly into your existing Python unit testing work flow.")
                      #:test-flags #~(list "lit.py" "tests")))
     ;; This can be built with any version of llvm.
     (native-inputs
-     (list llvm
+     (list llvm-13
            python-setuptools))
     (home-page "https://llvm.org/")
     (synopsis "LLVM Software Testing Tool")
diff --git a/gnu/packages/codex.scm b/gnu/packages/codex.scm
index 39a3dbde2b4..95fbd1f5041 100644
--- a/gnu/packages/codex.scm
+++ b/gnu/packages/codex.scm
@@ -821,7 +821,7 @@
               ;; Disable network access.
               (setenv "CODEX_SANDBOX_NETWORK_DISABLED" "1"))))))
     (native-inputs `(("bubblewrap" ,bubblewrap) ;tests need bwrap on PATH
-                     ("clang" ,clang)
+                     ("clang" ,clang-13)
                      ("cmake-minimal" ,cmake-minimal)
                      ("libunwind" ,libunwind)
                      ("lsof" ,lsof)            ;app-server tests
@@ -900,7 +900,7 @@ default-features = false
                   (display "22.22.0" port))))))))
     (native-inputs
      `(("cmake-minimal" ,cmake-minimal)
-       ("clang" ,clang)
+       ("clang" ,clang-13)
        ("pkg-config" ,pkg-config)
        ("bubblewrap-source" ,(package-source bubblewrap))))
     (inputs (cons* libcap openssl sqlite zlib `(,zstd "lib")
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 83e3f58a26b..2a78fe7ca1c 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -3354,7 +3354,7 @@ exported by the zlib library.")
       #~(list (string-append "CXX=" #$(cxx-for-target))
               ;; Linker fails when you use CC=cc-for-target
               (string-append "CC=" #$(cxx-for-target)))))
-    (native-inputs (list clang))
+    (native-inputs (list clang-13))
     (synopsis "Lossless data-compression program optimized for file size")
     (description
      "Cmix is a lossless data compression program aimed at optimizing compression
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index ae5f82f98ac..b4e7a366b13 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1839,7 +1839,7 @@ tools (containers, algorithms) used by other QuantStack packages.")
     (inputs
      (list rapidjson))
     (native-inputs
-     (list clang llvm))
+     (list clang-13 llvm-13))
     (home-page "https://github.com/MaskRay/ccls")
     (synopsis "C/C++/Objective-C language server")
     (description
diff --git a/gnu/packages/darwin.scm b/gnu/packages/darwin.scm
index 88990d04042..10b5fbe124d 100644
--- a/gnu/packages/darwin.scm
+++ b/gnu/packages/darwin.scm
@@ -81,11 +81,11 @@
                             "missing"
                             ,@(find-files "." "^Makefile\\.in$"))))))))
       (inputs (list libobjc2
-                    clang-toolchain))
+                    clang-toolchain-13))
       (native-inputs (list libtool
                            autoconf
                            automake
-                           clang-toolchain))
+                           clang-toolchain-13))
       (build-system gnu-build-system)
       (arguments
        (list
diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm
index 682ba735c12..49ecf73313d 100644
--- a/gnu/packages/debug.scm
+++ b/gnu/packages/debug.scm
@@ -310,8 +310,8 @@ simple way to add custom protocol messages.")
            python-pytest-flake8))
     (inputs
      (list bash-minimal
-           clang
-           llvm
+           clang-13
+           llvm-13
            unifdef
            python
            python-pebble
@@ -1165,7 +1165,7 @@ to aid in debugging.")
                    (search-input-file inputs "bin/tcc")))))))))
     (native-inputs (list antlr4
                          cmake-minimal
-                         clang           ;for tests
+                         clang-13        ;for tests
                          python-aiosmtpd ;for tests
                          python-dateutil ;for tests
                          python-docutils ;for tests
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index 14a661ea42a..c217b174607 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -211,7 +211,7 @@
             imagemagick
             libarchive
             libcaca
-            llvm
+            llvm-13
             lz4
             lzip
             ocaml
diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm
index 778afcdfaea..35f41101066 100644
--- a/gnu/packages/electronics.scm
+++ b/gnu/packages/electronics.scm
@@ -2696,7 +2696,7 @@ Automation}, portable and vendor neutral FPGA place and route tool.")
     (inputs
      (list jansson
            libffi
-           llvm
+           llvm-13
            readline
            tcl
            `(,zstd "lib")))
@@ -3125,7 +3125,7 @@ formats.")
            glpk
            gmp
            lemon-graph
-           libomp
+           libomp-13
            mpfr
            or-tools
            protobuf-6
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index b6c8e36d8ed..49a7ff3ee37 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -12960,7 +12960,7 @@ described on the homepage.")
               (invoke "cmake" "server"
                       (string-append "-DCMAKE_INSTALL_PREFIX=" #$output)))))))
     (inputs
-     (list clang))
+     (list clang-13))
     (build-system cmake-build-system)
     (synopsis "Server for the Emacs @dfn{irony mode}")))
 
diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index b46af2f1bd5..9d0b296e50b 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -815,7 +815,7 @@ from a mounted file system.")
     (native-inputs
      (list pkg-config))
     (inputs
-     (cons* clang
+     (cons* clang-13
             eudev
             keyutils
             libaio
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 5cb28cf70ac..07e16ce96be 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -3573,7 +3573,7 @@ notifies the user using any notification daemon implementing
            (list rust "cargo")
            rust-bindgen-cli
            shaderc
-           clang ; bindgen does not work without it
+           clang-13 ; bindgen does not work without it
            vulkan-headers
            ;; For tests
            python))
diff --git a/gnu/packages/fusion.scm b/gnu/packages/fusion.scm
index ea3e9e8a612..1df1178906c 100644
--- a/gnu/packages/fusion.scm
+++ b/gnu/packages/fusion.scm
@@ -78,7 +78,7 @@
                 (mkdir-p doc)
                 (copy-recursively "doc" doc)))))))
     (native-inputs
-     (list clang             ;; test-cl
+     (list clang-13          ;; test-cl
            dmd               ;; test-d
            glib              ;; test-c
            icu4c             ;; test-cpp
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index badcd8dc5a2..0be0c191d77 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -11897,7 +11897,7 @@ play with up to four players simultaneously.  It has network support.")
            (sdl-union
             (list sdl2 sdl2-mixer sdl2-net sdl2-ttf sdl2-image))))
     (native-inputs
-     (list clang ghc pkg-config qttools-5))
+     (list clang-13 ghc pkg-config qttools-5))
     (home-page "https://hedgewars.org/")
     (synopsis "Turn-based artillery game featuring fighting hedgehogs")
     (description
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f60bea8f2a1..b95631d6866 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13610,7 +13610,7 @@ GtkTextView widgets.")
     (inputs
      (list bash-minimal                 ;for wrap-program
            cmark
-           clang
+           clang-13
            devhelp
            d-spy
            ;; Cyclic modular dependency
@@ -13632,7 +13632,7 @@ GtkTextView widgets.")
            libportal
            libsoup
            libspelling
-           llvm
+           llvm-13
            libostree
            python
            python-pygobject-3.50
diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm
index ebad928326d..f7dd5c3480a 100644
--- a/gnu/packages/gnustep.scm
+++ b/gnu/packages/gnustep.scm
@@ -124,7 +124,7 @@ to easily create cross-compiled binaries.")
                                 "-DCMAKE_CXX_COMPILER=clang++"
                                 "-DTESTS=ON")))
     (inputs
-     (list clang robin-map))
+     (list clang-13 robin-map))
     (home-page "https://www.gnustep.org/")
     (synopsis "Objective-C runtime library for Clang")
     (description "Libobjc2 is an Objective-C runtime library designed as a
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 0fd0d522230..25a2a6ec38a 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -276,7 +276,7 @@ getTimeZoneTransition/transitions-close-together.js")))))
                                        (number->string (parallel-job-count)))))))))))
     (native-inputs
      (list autoconf
-           llvm                         ;for llvm-objdump
+           llvm-13                      ;for llvm-objdump
            m4
            perl
            pkg-config
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
diff --git a/gnu/packages/kde-sdk.scm b/gnu/packages/kde-sdk.scm
index 36583e6ea73..afa2b0f79ca 100644
--- a/gnu/packages/kde-sdk.scm
+++ b/gnu/packages/kde-sdk.scm
@@ -282,7 +282,7 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).")
     (native-inputs
      (list extra-cmake-modules pkg-config shared-mime-info qttools))
     (inputs (list boost
-                  clang
+                  clang-13
                   grantlee
                   karchive
                   kcmutils
diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index c44645840dd..9937b845c30 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -379,7 +379,7 @@ method, one of the most popular choices for Traditional Chinese users.")
     (native-inputs
      (list autoconf
            automake
-           clang
+           clang-13
            help2man
            libtool
            libyaml
diff --git a/gnu/packages/lean.scm b/gnu/packages/lean.scm
index a5278fe208d..e4705b611f8 100644
--- a/gnu/packages/lean.scm
+++ b/gnu/packages/lean.scm
@@ -70,7 +70,7 @@
            python-wrapper
            tzdata-for-tests))
     (inputs
-     (list cadical-2.1 gmp libuv llvm))
+     (list cadical-2.1 gmp libuv llvm-13))
     (arguments
      (list
       #:make-flags
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 3ba1198b7be..34c57567d86 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -210,7 +210,7 @@ executable Common Lisp image.  It is similar to cl-launch and hu.dwim.build.")
                                      "carp-header-parse")))))))
       (inputs
        (list bash-minimal
-             clang
+             clang-13
              ghc-blaze-markup
              ghc-blaze-html
              ghc-split
@@ -1138,7 +1138,7 @@ and make for REPLs that start blazing fast.
        (sha256
         (base32 "0cr1w4lcszipfp7d0pk7v42dzqrd6i7b498f81lqymijgp3v4vkd"))))
     (build-system gnu-build-system)
-    (inputs (list clang readline libffi openssl pkg-config))
+    (inputs (list clang-13 readline libffi openssl pkg-config))
     (arguments
      '(#:phases (modify-phases %standard-phases
                   (delete 'configure)
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
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 305e1318db1..d8f186ddad1 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -6328,7 +6328,7 @@ Jax, PyTorch and TensorFlow — with a seamless integration between them.")
             (lambda* (#:rest args)
               (apply (assoc-ref gnu:%standard-phases 'check)
                      #:test-target "ctranslate2_test" args))))))
-    (native-inputs (list libomp
+    (native-inputs (list libomp-13
                          cxxopts
                          spdlog
                          googletest
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 9baf974ac5a..57c5f3b9cbe 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -3989,7 +3989,7 @@ on the fly.  Both programs are written in C and are very fast.")
                "CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS" "1")
               (setenv "JEMALLOC_OVERRIDE"
                       (search-input-file inputs "/lib/libjemalloc.so")))))))
-    (native-inputs (list clang pkg-config))
+    (native-inputs (list clang-13 pkg-config))
     (inputs (cons* bzip2
                    jemalloc
                    librdkafka
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 3e36ce5f06a..6d463eb226c 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -11424,7 +11424,7 @@ the Wolfram language.")
              (setenv "MATHICS_CHARACTER_ENCODING" "ASCII"))))))
     (build-system pyproject-build-system)
     (native-inputs (list python-pytest python-setuptools python-wheel))
-    (inputs (list llvm))
+    (inputs (list llvm-13))
     (propagated-inputs (list python-mpmath
                              python-pint
                              python-palettable
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 290e71e5eeb..51ecaca453d 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -5738,13 +5738,15 @@ necessary set of rewriters.")
                         (string-append
                          (assoc-ref outputs "out")
                          "/lib/ocaml/site-lib")
-                        (string-append "--with-llvm-version=" #$(package-version llvm))
+                        (string-append "--with-llvm-version="
+                                       #$(package-version
+                                          (this-package-input "llvm")))
                         "--with-llvm-config=llvm-config"
                         "--disable-ghidra"
                         "--disable-llvm-static"
                         "--enable-llvm"
                         "--enable-everything"))))))
-      (native-inputs (list clang ocaml-oasis ocaml-ounit))
+      (native-inputs (list clang-13 ocaml-oasis ocaml-ounit))
       (propagated-inputs
        (list
         camlzip
@@ -5768,7 +5770,7 @@ necessary set of rewriters.")
         ocaml-z3
         ocaml-zarith))
       (inputs
-       (list gmp llvm ncurses))
+       (list gmp llvm-13 ncurses))
       (synopsis "Binary Analysis Platform")
       (description "Binary Analysis Platform is a framework for writing program
 analysis tools, that target binary files.  The framework consists of a plethora
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index c0d1207cb66..df6f7d01dc7 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -762,7 +762,7 @@ photographic equipment.")
            `(,glib "bin")
            gobject-introspection
            intltool
-           llvm
+           llvm-13
            opencl-headers
            perl
            pkg-config
@@ -791,7 +791,7 @@ photographic equipment.")
            libheif
            libjpeg-turbo
            libjxl                    ;optional, for JPEG-XL support
-           libomp
+           libomp-13
            libpng
            libraw
            libsecret                 ;optional, for storing passwords
@@ -877,7 +877,7 @@ and enhance them.")
              `(,glib "bin")
              gobject-introspection
              intltool
-             llvm                       ;optional
+             llvm-13                    ;optional
              opencl-headers
              perl
              pkg-config
@@ -955,7 +955,7 @@ help you achieve your own interpretation of raw digital photographs.")
     (native-inputs
      (list pkg-config qttools-5))
     (inputs
-     (list graphicsmagick libomp qtbase-5))
+     (list graphicsmagick libomp-13 qtbase-5))
     (home-page "https://photoflare.io")
     (synopsis "Quick, simple but powerful image editor")
     (description "Photoflare is a cross-platform image editor with an aim
diff --git a/gnu/packages/physics.scm b/gnu/packages/physics.scm
index 407cfbc5b36..a029164722d 100644
--- a/gnu/packages/physics.scm
+++ b/gnu/packages/physics.scm
@@ -241,7 +241,7 @@ which are themselves described in 'ddl.dic'.")
      (list boost
            openblas
            python
-           libomp))
+           libomp-13))
     (propagated-inputs
      (list python-beartype
            python-graphviz
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 8f1d1854933..5845d02d6a0 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -6308,7 +6308,7 @@ authentication on behalf of its clients.")
                 "1y0g1j9ib1b0likjizw70hibky20gxxirqls6hf4crc214279v0m"))))
     (build-system cmake-build-system)
     (native-inputs (list python))
-    (inputs (list clang llvm))
+    (inputs (list clang-13 llvm-13))
     (home-page "https://github.com/KDE/clazy/")
     (synopsis "Qt-oriented static code analyzer")
     (description "clazy is a compiler plugin which allows @command{clang} to
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index b6bd4bb449e..192561bfbf3 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -655,8 +655,8 @@ choice.  Supported launchers are: dmenu, fuzzel, rofi, walker and custom.")
        (sha256
         (base32 "0frzcnyah3a1srdwyx2rcpbh7hpwy6608cvhsqz5z9hdc08z8cg3"))))
     (build-system cargo-build-system)
-    (native-inputs (list clang cmake-minimal %tinycbor-source))
-    (inputs (cons llvm (cargo-inputs 'c2rust)))
+    (native-inputs (list clang-13 cmake-minimal %tinycbor-source))
+    (inputs (cons llvm-13 (cargo-inputs 'c2rust)))
     (arguments
      (list #:install-source? #f
            #:phases
@@ -1832,7 +1832,7 @@ repositories.")
                  configure
                  check-for-pregenerated-files
                  patch-cargo-checksums)))))))
-    (native-inputs (list clang pkg-config rust `(,rust "cargo")))
+    (native-inputs (list clang-13 pkg-config rust `(,rust "cargo")))
     (inputs (cons* glib gtk libadwaita pipewire (cargo-inputs 'helvum)))
     (home-page "https://gitlab.freedesktop.org/pipewire/helvum")
     (synopsis "GTK patchbay for pipewire")
@@ -2899,7 +2899,7 @@ performance and customizability.")
                         #:include-regexp ("\\.1$")))
                      args))))))
     (native-inputs (list git-minimal/pinned pkg-config))
-    (inputs (cons* bzip2 bzip3-1.4 clang xz zlib `(,zstd "lib")
+    (inputs (cons* bzip2 bzip3-1.4 clang-13 xz zlib `(,zstd "lib")
                    (cargo-inputs 'ouch)))
     (home-page "https://github.com/ouch-org/ouch")
     (synopsis "Compression and decompression utility")
@@ -2924,7 +2924,7 @@ decompressing files and directories.")
     (build-system cargo-build-system)
     (arguments
      (list #:install-source? #f))
-    (native-inputs (list clang pkg-config))
+    (native-inputs (list clang-13 pkg-config))
     (inputs (cons* pipewire
                    (cargo-inputs 'pwmenu)))
     (home-page "https://github.com/e-tho/pwmenu")
@@ -3678,7 +3678,7 @@ of the project is to be runnable on untrusted networks without crashing.")
     (arguments
      (list #:install-source? #f))
     (native-inputs
-     (list clang pkg-config))
+     (list clang-13 pkg-config))
     (inputs
      (cons* alsa-lib ffmpeg
             (cargo-inputs 'soundcloud-tui)))
diff --git a/gnu/packages/rust-sources.scm b/gnu/packages/rust-sources.scm
index 552a2be1009..94be5b248bd 100644
--- a/gnu/packages/rust-sources.scm
+++ b/gnu/packages/rust-sources.scm
@@ -857,7 +857,7 @@ UTF-32 support.")
                           "-f" "win64" "-i" "include/" "-i" "pregenerated/tmp/"
                           "-Xgnu" "-gcv8" script))
                 (find-files "pregenerated/tmp" "nasm\\.asm")))))))
-     (native-inputs (list clang go gzip nasm perl python-minimal tar))
+     (native-inputs (list clang-13 go gzip nasm perl python-minimal tar))
      (propagated-inputs (cargo-inputs 'rust-ring-0.17))
      (home-page "https://github.com/briansmith/ring")
      (synopsis "Safe, fast, small crypto using Rust")
diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm
index 17fc2add5f5..09a0e4c5c4f 100644
--- a/gnu/packages/sequoia.scm
+++ b/gnu/packages/sequoia.scm
@@ -111,7 +111,7 @@
     (inputs
      (cons* nettle openssl sqlite (cargo-inputs 'sequoia-chameleon-gnupg)))
     (native-inputs
-     (list capnproto clang gnupg pkg-config sequoia-sq))
+     (list capnproto clang-13 gnupg pkg-config sequoia-sq))
     (home-page "https://sequoia-pgp.org/")
     (synopsis "Sequoia's reimplementation of the GnuPG interface")
     (description "This package provides Sequoia's reimplementation of the
@@ -180,7 +180,7 @@ This Guix package is built to use the nettle cryptographic library.")
     (inputs
      (cons* nettle openssl pcsc-lite sqlite (cargo-inputs 'sequoia-sq)))
     (native-inputs
-     (list capnproto clang pkg-config))
+     (list capnproto clang-13 pkg-config))
     (home-page "https://sequoia-pgp.org/")
     (synopsis "Command-line frontend for Sequoia OpenPGP")
     (description "This package provides the command-line frontend for Sequoia
@@ -205,7 +205,7 @@ gpg-agent, openpgp-card and softkeys keystore backends.")
     (inputs
      (cons* bzip2 nettle openssl (cargo-inputs 'sequoia-sqv)))
     (native-inputs
-     (list clang pkg-config))
+     (list clang-13 pkg-config))
     (arguments
      `(#:imported-modules ((guix build copy-build-system)
                            ,@%cargo-build-system-modules)
@@ -289,7 +289,7 @@ This Guix package is built to use the nettle cryptographic library.")
     (inputs
      (cons* nettle openssl sqlite (cargo-inputs 'sequoia-wot-tools)))
     (native-inputs
-     (list clang gnupg pkg-config))
+     (list clang-13 gnupg pkg-config))
     (home-page "https://sequoia-pgp.org/")
     (synopsis "Implementation of OpenPGP's web of trust")
     (description
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 53579b35d74..b0dec741860 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -563,7 +563,7 @@ provides semantic syntax highlighting and selections in the Kakoune text editor.
                (install-file "rc/parinfer.kak"
                              (string-append out "/share/kak/autoload"))))))))
     (inputs
-     (cons clang (cargo-inputs 'parinfer-rust)))
+     (cons clang-13 (cargo-inputs 'parinfer-rust)))
     (home-page "https://github.com/justinbarclay/parinfer-rust")
     (synopsis "Infer parentheses for Clojure, Lisp and Scheme")
     (description
@@ -597,7 +597,7 @@ can load dynamic libraries.")
                        (let ((lib (string-append #$output "/lib")))
                          (with-directory-excursion "target/release"
                            (install-file "libparinfer_rust.so" lib))))))))
-    (inputs (cons clang (cargo-inputs 'parinfer-rust-emacs)))
+    (inputs (cons clang-13 (cargo-inputs 'parinfer-rust-emacs)))
     (home-page "https://github.com/justinbarclay/parinfer-rust-emacs")
     (synopsis "Emacs-centric fork of parinfer-rust")
     (description
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 5e597a6ef5f..324253b7e1c 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -3440,7 +3440,7 @@ which is a hypervisor.")
     (native-inputs
      (list pkg-config
            xen ; Pull in Xen for libxenstore
-           clang))
+           clang-13))
     (inputs (cargo-inputs 'xen-guest-agent))
     (home-page "https://gitlab.com/xen-project/xen-guest-agent")
     (synopsis "Provides guest VM information to hosting Xen hypervisor")
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index ed7da6f61d0..c450288c383 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2705,7 +2705,7 @@ built on dwl — crafted for speed, flexibility, and a customizable desktop expe
          '())
      (list pkg-config)))
    (inputs
-    (cons* clang
+    (cons* clang-13
            dbus
            libdisplay-info
            libinput-minimal
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 9101c363778..8f88011a10d 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -3104,7 +3104,7 @@ server driver works.")
     (inputs
      (list libx11
            libxext
-           llvm
+           llvm-13
            mesa ; for xatracker
            xorg-server))
     (native-inputs
@@ -6587,7 +6587,7 @@ direct replacement for @command{xvfb-run} specifically.
                      (copy-file src dst)))))))
     (native-inputs (list pkg-config))
     (inputs
-     (cons* clang
+     (cons* clang-13
             fontconfig
             xcb-util-cursor
             xorg-server-xwayland